kernel: update kernel to version 2.6.39.4

SVN-Revision: 28022
This commit is contained in:
Hauke Mehrtens
2011-08-16 22:04:10 +00:00
parent 3e94ee9642
commit 09b1073f9b
12 changed files with 15 additions and 15 deletions

View File

@@ -91,7 +91,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
if (!net_eq(dev_net(dev), sock_net(sk)))
goto drop;
@@ -1523,6 +1526,7 @@ static int packet_create(struct net *net
@@ -1524,6 +1527,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;
@@ -2091,6 +2095,16 @@ packet_setsockopt(struct socket *sock, i
@@ -2093,6 +2097,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;
}
@@ -2148,6 +2162,13 @@ static int packet_getsockopt(struct sock
@@ -2150,6 +2164,13 @@ static int packet_getsockopt(struct sock
data = &val;
break;

View File

@@ -1,6 +1,6 @@
--- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h
@@ -132,6 +132,7 @@ struct net_bridge_port
@@ -133,6 +133,7 @@ struct net_bridge_port
unsigned long flags;
#define BR_HAIRPIN_MODE 0x00000001