diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2013-02-19 09:17:38 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2013-02-19 09:17:38 +0000 |
| commit | ed0f43f1e2ddc62fdc2e50edabc9f46236758a93 (patch) | |
| tree | 20cbd4eb6be5a5477caa7565a165acd918347aa5 /target/linux/generic/patches-3.8/630-packet_socket_type.patch | |
| parent | 48bc2fbff3bcde1f7e848d04bac2216e5e3c016f (diff) | |
| download | upstream-ed0f43f1e2ddc62fdc2e50edabc9f46236758a93.tar.gz upstream-ed0f43f1e2ddc62fdc2e50edabc9f46236758a93.tar.bz2 upstream-ed0f43f1e2ddc62fdc2e50edabc9f46236758a93.zip | |
kernel: update linux 3.8-rcX to 3.8
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 35672
Diffstat (limited to 'target/linux/generic/patches-3.8/630-packet_socket_type.patch')
| -rw-r--r-- | target/linux/generic/patches-3.8/630-packet_socket_type.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/patches-3.8/630-packet_socket_type.patch b/target/linux/generic/patches-3.8/630-packet_socket_type.patch index 921c810f0e..0671a28e9b 100644 --- a/target/linux/generic/patches-3.8/630-packet_socket_type.patch +++ b/target/linux/generic/patches-3.8/630-packet_socket_type.patch @@ -83,7 +83,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> if (!net_eq(dev_net(dev), sock_net(sk))) goto drop; -@@ -2537,6 +2539,7 @@ static int packet_create(struct net *net +@@ -2539,6 +2541,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; @@ -91,7 +91,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> if (sock->type == SOCK_PACKET) po->prot_hook.func = packet_rcv_spkt; -@@ -3150,6 +3153,16 @@ packet_setsockopt(struct socket *sock, i +@@ -3152,6 +3155,16 @@ packet_setsockopt(struct socket *sock, i po->tp_tx_has_off = !!val; return 0; } @@ -108,7 +108,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> default: return -ENOPROTOOPT; } -@@ -3204,6 +3217,13 @@ static int packet_getsockopt(struct sock +@@ -3206,6 +3219,13 @@ static int packet_getsockopt(struct sock case PACKET_VNET_HDR: val = po->has_vnet_hdr; break; |