From: Jeff Kirsher <redacted>
Date: Fri, 24 Feb 2012 02:12:53 -0800
The following are changes since commit 7c3a95a15ad2a5278498a72df0463131048926a3:
davinci_mdio: Correct bitmask for clock divider value
and are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next master
Applied, but I had to add the following patch on top for completeness.
--------------------
net: Add missing getsockopt for SO_NOFCS.
Signed-off-by: David S. Miller <davem@davemloft.net>
---
net/core/sock.c | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/net/core/sock.c b/net/core/sock.c
index 55011cb..216719c 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -1035,6 +1035,9 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
v.val = sk->sk_peek_off;
break;
+ case SO_NOFCS:
+ v.val = !!sock_flag(sk, SOCK_NOFCS);
+ break;
default:
return -ENOPROTOOPT;
}
--
1.7.7.6