diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2013-02-15 07:36:15 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2013-02-15 07:36:15 +0000 |
| commit | 162b8e23a5b6ddc158bd382cbd8ae8b31cac9082 (patch) | |
| tree | 4b2186899ad176f455af45b0b3feede02ab57ff4 /target/linux/generic | |
| parent | f35c369710959b964e0d16d5c45dd497093df61e (diff) | |
| download | upstream-162b8e23a5b6ddc158bd382cbd8ae8b31cac9082.tar.gz upstream-162b8e23a5b6ddc158bd382cbd8ae8b31cac9082.tar.bz2 upstream-162b8e23a5b6ddc158bd382cbd8ae8b31cac9082.zip | |
kernel: update linux 3.7 to 3.7.8
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 35604
Diffstat (limited to 'target/linux/generic')
3 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/generic/patches-3.7/630-packet_socket_type.patch b/target/linux/generic/patches-3.7/630-packet_socket_type.patch index 27a46078e6..40200377c9 100644 --- a/target/linux/generic/patches-3.7/630-packet_socket_type.patch +++ b/target/linux/generic/patches-3.7/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; -@@ -2511,6 +2513,7 @@ static int packet_create(struct net *net +@@ -2513,6 +2515,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; -@@ -3111,6 +3114,16 @@ packet_setsockopt(struct socket *sock, i +@@ -3113,6 +3116,16 @@ packet_setsockopt(struct socket *sock, i return fanout_add(sk, val & 0xffff, val >> 16); } @@ -108,7 +108,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> default: return -ENOPROTOOPT; } -@@ -3165,6 +3178,13 @@ static int packet_getsockopt(struct sock +@@ -3167,6 +3180,13 @@ static int packet_getsockopt(struct sock case PACKET_VNET_HDR: val = po->has_vnet_hdr; break; diff --git a/target/linux/generic/patches-3.7/651-wireless_mesh_header.patch b/target/linux/generic/patches-3.7/651-wireless_mesh_header.patch index ff3f0979f0..c21b007777 100644 --- a/target/linux/generic/patches-3.7/651-wireless_mesh_header.patch +++ b/target/linux/generic/patches-3.7/651-wireless_mesh_header.patch @@ -1,6 +1,6 @@ --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h -@@ -134,7 +134,7 @@ static inline bool dev_xmit_complete(int +@@ -137,7 +137,7 @@ static inline bool dev_xmit_complete(int */ #if defined(CONFIG_WLAN) || IS_ENABLED(CONFIG_AX25) diff --git a/target/linux/generic/patches-3.7/721-phy_packets.patch b/target/linux/generic/patches-3.7/721-phy_packets.patch index 8dda0934b5..b8c15fcc6c 100644 --- a/target/linux/generic/patches-3.7/721-phy_packets.patch +++ b/target/linux/generic/patches-3.7/721-phy_packets.patch @@ -1,6 +1,6 @@ --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h -@@ -1074,6 +1074,11 @@ struct net_device { +@@ -1077,6 +1077,11 @@ struct net_device { const struct net_device_ops *netdev_ops; const struct ethtool_ops *ethtool_ops; @@ -12,7 +12,7 @@ /* Hardware header description */ const struct header_ops *header_ops; -@@ -1130,6 +1135,9 @@ struct net_device { +@@ -1133,6 +1138,9 @@ struct net_device { void *ax25_ptr; /* AX.25 specific data */ struct wireless_dev *ieee80211_ptr; /* IEEE 802.11 specific data, assign before registering */ |