diff --git a/[refs] b/[refs] index 9462ff623ccf..28ee51d673ce 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0da5f7c6d2a2653e3c8867df5f226e62377a141f +refs/heads/master: f7b86bfe8d9f10e5a9fcacf52dddf29d0d58a33b diff --git a/trunk/net/core/sock.c b/trunk/net/core/sock.c index 8a146cfcc366..c49412cdd12c 100644 --- a/trunk/net/core/sock.c +++ b/trunk/net/core/sock.c @@ -1074,6 +1074,9 @@ int sock_getsockopt(struct socket *sock, int level, int optname, case SO_NOFCS: v.val = sock_flag(sk, SOCK_NOFCS); break; + case SO_BINDTODEVICE: + v.val = sk->sk_bound_dev_if; + break; default: return -ENOPROTOOPT; }