diff options
| author | jogo <jogo@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-10-20 10:32:44 +0000 |
|---|---|---|
| committer | jogo <jogo@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-10-20 10:32:44 +0000 |
| commit | ad05c9925313bccdb86c0305f72dd2188d8231fe (patch) | |
| tree | badb10f376914e1eba5d0d1028a3bd45eae9f3f3 /target/linux/generic/patches-3.1/630-packet_socket_type.patch | |
| parent | 9f315758861499aeacd81d1dcc95e9ba7cf11401 (diff) | |
linux: generic: refresh patches for 3.1-rc10
Hopefully the last one and identical to final.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28492 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.1/630-packet_socket_type.patch')
| -rw-r--r-- | target/linux/generic/patches-3.1/630-packet_socket_type.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/patches-3.1/630-packet_socket_type.patch b/target/linux/generic/patches-3.1/630-packet_socket_type.patch index cdbb787aa..e295ce1d1 100644 --- a/target/linux/generic/patches-3.1/630-packet_socket_type.patch +++ b/target/linux/generic/patches-3.1/630-packet_socket_type.patch @@ -75,7 +75,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> if (!net_eq(dev_net(dev), sock_net(sk))) goto drop; -@@ -994,12 +997,12 @@ static int tpacket_rcv(struct sk_buff *s +@@ -997,12 +1000,12 @@ static int tpacket_rcv(struct sk_buff *s struct timespec ts; struct skb_shared_hwtstamps *shhwtstamps = skb_hwtstamps(skb); @@ -91,7 +91,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> if (!net_eq(dev_net(dev), sock_net(sk))) goto drop; -@@ -1826,6 +1829,7 @@ static int packet_create(struct net *net +@@ -1829,6 +1832,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; -@@ -2410,6 +2414,16 @@ packet_setsockopt(struct socket *sock, i +@@ -2413,6 +2417,16 @@ packet_setsockopt(struct socket *sock, i return fanout_add(sk, val & 0xffff, val >> 16); } @@ -116,7 +116,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> default: return -ENOPROTOOPT; } -@@ -2467,6 +2481,13 @@ static int packet_getsockopt(struct sock +@@ -2470,6 +2484,13 @@ static int packet_getsockopt(struct sock data = &val; break; |