diff options
| author | David S. Miller <davem@davemloft.net> | 2012-08-31 15:14:10 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-08-31 15:14:18 -0400 |
| commit | c32f38619af6302da58835fb292b159bdd96d11f (patch) | |
| tree | a5bb4a9c51999557eaa919f27369c70811cd813c /net/packet | |
| parent | 761743ebc92df72053e736fce953a5d2e90099d5 (diff) | |
| parent | 0dcd5052c8543ef999bcd252cee50b7ae8111e89 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Merge the 'net' tree to get the recent set of netfilter bug fixes in
order to assist with some merge hassles Pablo is going to have to deal
with for upcoming changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/packet')
| -rw-r--r-- | net/packet/af_packet.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c index 5dafe84d75d5..94060edbbd70 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c | |||
| @@ -1162,7 +1162,7 @@ static void __fanout_unlink(struct sock *sk, struct packet_sock *po) | |||
| 1162 | spin_unlock(&f->lock); | 1162 | spin_unlock(&f->lock); |
| 1163 | } | 1163 | } |
| 1164 | 1164 | ||
| 1165 | bool match_fanout_group(struct packet_type *ptype, struct sock * sk) | 1165 | static bool match_fanout_group(struct packet_type *ptype, struct sock * sk) |
| 1166 | { | 1166 | { |
| 1167 | if (ptype->af_packet_priv == (void*)((struct packet_sock *)sk)->fanout) | 1167 | if (ptype->af_packet_priv == (void*)((struct packet_sock *)sk)->fanout) |
| 1168 | return true; | 1168 | return true; |