diff options
author | Imre Kaloz <kaloz@openwrt.org> | 2009-11-17 10:06:15 +0000 |
---|---|---|
committer | Imre Kaloz <kaloz@openwrt.org> | 2009-11-17 10:06:15 +0000 |
commit | 0b27fefa6299eb5ef2e663514226528e4ebbd322 (patch) | |
tree | d24f5520362d42aa7bb4e262a7f7977bf17b3aae /target/linux/generic-2.6/patches-2.6.32/240-packet_socket_type.patch | |
parent | 294551ca73acd677fba4a4fdddd35d6567874dd4 (diff) | |
download | upstream-0b27fefa6299eb5ef2e663514226528e4ebbd322.tar.gz upstream-0b27fefa6299eb5ef2e663514226528e4ebbd322.tar.bz2 upstream-0b27fefa6299eb5ef2e663514226528e4ebbd322.zip |
refresh 2.6.32 patches with -rc7
SVN-Revision: 18440
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.32/240-packet_socket_type.patch')
-rw-r--r-- | target/linux/generic-2.6/patches-2.6.32/240-packet_socket_type.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.32/240-packet_socket_type.patch b/target/linux/generic-2.6/patches-2.6.32/240-packet_socket_type.patch index 42fcb9315f..71827643e6 100644 --- a/target/linux/generic-2.6/patches-2.6.32/240-packet_socket_type.patch +++ b/target/linux/generic-2.6/patches-2.6.32/240-packet_socket_type.patch @@ -91,7 +91,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> if (dev_net(dev) != sock_net(sk)) goto drop; -@@ -1384,6 +1387,7 @@ static int packet_create(struct net *net +@@ -1381,6 +1384,7 @@ static int packet_create(struct net *net spin_lock_init(&po->bind_lock); mutex_init(&po->pg_vec_lock); po->prot_hook.func = packet_rcv; @@ -99,7 +99,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> if (sock->type == SOCK_PACKET) po->prot_hook.func = packet_rcv_spkt; -@@ -1731,6 +1735,16 @@ packet_setsockopt(struct socket *sock, i +@@ -1728,6 +1732,16 @@ packet_setsockopt(struct socket *sock, i ret = packet_mc_drop(sk, &mreq); return ret; } @@ -116,7 +116,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> #ifdef CONFIG_PACKET_MMAP case PACKET_RX_RING: -@@ -1876,6 +1890,13 @@ static int packet_getsockopt(struct sock +@@ -1873,6 +1887,13 @@ static int packet_getsockopt(struct sock data = &val; break; |