diff options
| author | Florian Fainelli <florian@openwrt.org> | 2011-02-19 12:44:07 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2011-02-19 12:44:07 +0000 |
| commit | 61e86ac4c35a3d1c6c99ac66861223fe480035af (patch) | |
| tree | 267576c20043172d1a25fe91f865286cc1c7c6b4 /target/linux/generic/patches-2.6.36/240-packet_socket_type.patch | |
| parent | eb8d84e896a6aa9e74efc9c3a783c23cc5bc93ff (diff) | |
| download | upstream-61e86ac4c35a3d1c6c99ac66861223fe480035af.tar.gz upstream-61e86ac4c35a3d1c6c99ac66861223fe480035af.tar.bz2 upstream-61e86ac4c35a3d1c6c99ac66861223fe480035af.zip | |
[kernel] update to kernel 2.6.36.4
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25580 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-2.6.36/240-packet_socket_type.patch')
| -rw-r--r-- | target/linux/generic/patches-2.6.36/240-packet_socket_type.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/patches-2.6.36/240-packet_socket_type.patch b/target/linux/generic/patches-2.6.36/240-packet_socket_type.patch index 204512ff11..f5cb465e93 100644 --- a/target/linux/generic/patches-2.6.36/240-packet_socket_type.patch +++ b/target/linux/generic/patches-2.6.36/240-packet_socket_type.patch @@ -99,7 +99,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> if (sock->type == SOCK_PACKET) po->prot_hook.func = packet_rcv_spkt; -@@ -2054,6 +2058,16 @@ packet_setsockopt(struct socket *sock, i +@@ -2057,6 +2061,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; } -@@ -2111,6 +2125,13 @@ static int packet_getsockopt(struct sock +@@ -2114,6 +2128,13 @@ static int packet_getsockopt(struct sock data = &val; break; |