Messages in this thread Patch in this message | | | Date | Sun, 4 Feb 2007 16:34:54 +0100 | Subject | [PATCH] ipv4: remove a call to skb_queue_len() in inet_diag.c | From | Thomas Hisch <> |
| |
remove unneeded call to skb_queue_len (skb_dequeue already checks queuelen) and replace a sizeof() by a Netlink Macro
Signed-off-by: Thomas Hisch <t.hisch@gmail.com> ---
sorry, my previous version of this patch didn't conform to the Codingstyle document. now everything should be fine.
net/ipv4/inet_diag.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/net/ipv4/inet_diag.c b/net/ipv4/inet_diag.c index 77761ac..9cf27c7 100644 --- a/net/ipv4/inet_diag.c +++ b/net/ipv4/inet_diag.c @@ -846,7 +846,7 @@ static inline void inet_diag_rcv_skb(struct sk_buff *skb) int err; struct nlmsghdr *nlh = (struct nlmsghdr *)skb->data; - if (nlh->nlmsg_len < sizeof(*nlh) || + if (nlh->nlmsg_len < NLMSG_HDRLEN || skb->len < nlh->nlmsg_len) return; err = inet_diag_rcv_msg(skb, nlh); @@ -858,9 +858,8 @@ static inline void inet_diag_rcv_skb(struct sk_buff *skb) static void inet_diag_rcv(struct sock *sk, int len) { struct sk_buff *skb; - unsigned int qlen = skb_queue_len(&sk->sk_receive_queue); - while (qlen-- && (skb = skb_dequeue(&sk->sk_receive_queue))) { + while ((skb = skb_dequeue(&sk->sk_receive_queue)) != NULL) { inet_diag_rcv_skb(skb); kfree_skb(skb); } -- 1.5.0.rc3.22.g5057 - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |