[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-Id: <20120224.144926.1896492725127004622.davem@davemloft.net>
Date: Fri, 24 Feb 2012 14:49:26 -0500 (EST)
From: David Miller <davem@...emloft.net>
To: jeffrey.t.kirsher@...el.com
Cc: netdev@...r.kernel.org, gospo@...hat.com, sassmann@...hat.com
Subject: Re: [net-next 00/16][pull request] Intel Wired LAN Driver Updates
From: Jeff Kirsher <jeffrey.t.kirsher@...el.com>
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@...emloft.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
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists