diff options
| author | David S. Miller <davem@davemloft.net> | 2008-07-06 02:08:07 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-06 02:08:07 -0400 |
| commit | ea2aca084ba82aaf7c148d04914ceed8758ce08a (patch) | |
| tree | dcb3f4f849cf48deac2dd3bafd5c2cd2f0e7dc79 /net/netlink | |
| parent | f3032be921cd126615ce3bfd7084e3d319f3f892 (diff) | |
| parent | c5a78ac00c400df29645e59938700301efb371d0 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
Documentation/feature-removal-schedule.txt
drivers/net/wan/hdlc_fr.c
drivers/net/wireless/iwlwifi/iwl-4965.c
drivers/net/wireless/iwlwifi/iwl3945-base.c
Diffstat (limited to 'net/netlink')
| -rw-r--r-- | net/netlink/af_netlink.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c index 6507c02dbe0d..98bfe277eab2 100644 --- a/net/netlink/af_netlink.c +++ b/net/netlink/af_netlink.c | |||
| @@ -886,7 +886,7 @@ retry: | |||
| 886 | return netlink_unicast_kernel(sk, skb); | 886 | return netlink_unicast_kernel(sk, skb); |
| 887 | 887 | ||
| 888 | if (sk_filter(sk, skb)) { | 888 | if (sk_filter(sk, skb)) { |
| 889 | int err = skb->len; | 889 | err = skb->len; |
| 890 | kfree_skb(skb); | 890 | kfree_skb(skb); |
| 891 | sock_put(sk); | 891 | sock_put(sk); |
| 892 | return err; | 892 | return err; |