diff options
| author | Jonas Gorski <jogo@openwrt.org> | 2011-11-19 18:39:12 +0000 |
|---|---|---|
| committer | Jonas Gorski <jogo@openwrt.org> | 2011-11-19 18:39:12 +0000 |
| commit | 16fd48e131c7085f7e44527c007788e05da80476 (patch) | |
| tree | 39e2cbceebad180ff668e938e073b12dae8f0ecc /target/linux/generic/patches-3.0/630-packet_socket_type.patch | |
| parent | 96285ef8bd36201c0187e8fd867c393b6c5a17d8 (diff) | |
| download | upstream-16fd48e131c7085f7e44527c007788e05da80476.tar.gz upstream-16fd48e131c7085f7e44527c007788e05da80476.tar.bz2 upstream-16fd48e131c7085f7e44527c007788e05da80476.zip | |
linux: update 3.0 to 3.0.9
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29264 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.0/630-packet_socket_type.patch')
| -rw-r--r-- | target/linux/generic/patches-3.0/630-packet_socket_type.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/patches-3.0/630-packet_socket_type.patch b/target/linux/generic/patches-3.0/630-packet_socket_type.patch index 934e195b8d..99b5553b45 100644 --- a/target/linux/generic/patches-3.0/630-packet_socket_type.patch +++ b/target/linux/generic/patches-3.0/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; -@@ -687,12 +690,12 @@ static int tpacket_rcv(struct sk_buff *s +@@ -690,12 +693,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; -@@ -1529,6 +1532,7 @@ static int packet_create(struct net *net +@@ -1532,6 +1535,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; -@@ -2102,6 +2106,16 @@ packet_setsockopt(struct socket *sock, i +@@ -2105,6 +2109,16 @@ packet_setsockopt(struct socket *sock, i po->tp_tstamp = val; return 0; } @@ -116,7 +116,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> default: return -ENOPROTOOPT; } -@@ -2159,6 +2173,13 @@ static int packet_getsockopt(struct sock +@@ -2162,6 +2176,13 @@ static int packet_getsockopt(struct sock data = &val; break; |