diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2009-04-30 14:11:39 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2009-04-30 14:11:39 +0000 |
| commit | 6ed4b5c15d2a382c00569907881b36640059bf30 (patch) | |
| tree | 19b9a704fa0688801784ed0f3b4a29d72fd6c6cd /target/linux/generic-2.6/patches-2.6.29 | |
| parent | 76377332a4822677d3d96341abcafa01dfc5bcbf (diff) | |
| download | upstream-6ed4b5c15d2a382c00569907881b36640059bf30.tar.gz upstream-6ed4b5c15d2a382c00569907881b36640059bf30.tar.bz2 upstream-6ed4b5c15d2a382c00569907881b36640059bf30.zip | |
refresh the packet socket patch for 2.6.29
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15511 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.29')
| -rw-r--r-- | target/linux/generic-2.6/patches-2.6.29/240-packet_socket_type.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.29/240-packet_socket_type.patch b/target/linux/generic-2.6/patches-2.6.29/240-packet_socket_type.patch index 720d3201f3..e2840ea6b9 100644 --- a/target/linux/generic-2.6/patches-2.6.29/240-packet_socket_type.patch +++ b/target/linux/generic-2.6/patches-2.6.29/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; -@@ -1072,6 +1075,7 @@ static int packet_create(struct net *net +@@ -1073,6 +1076,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; -@@ -1411,6 +1415,16 @@ packet_setsockopt(struct socket *sock, i +@@ -1413,6 +1417,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: -@@ -1542,6 +1556,13 @@ static int packet_getsockopt(struct sock +@@ -1544,6 +1558,13 @@ static int packet_getsockopt(struct sock data = &val; break; |