diff options
| author | David S. Miller <davem@davemloft.net> | 2010-04-21 04:14:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-21 04:14:25 -0400 |
| commit | 87eb367003887cdc81a5d183efea227b5b488961 (patch) | |
| tree | 40f617e25a9364d573e3cd2189c9e7fa56c8a0fe /net/packet | |
| parent | ccb7c7732e2ceb4e81a7806faf1670be9681ccd2 (diff) | |
| parent | 05d17608a69b3ae653ea5c9857283bef3439c733 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-6000.c
net/core/dev.c
Diffstat (limited to 'net/packet')
| -rw-r--r-- | net/packet/af_packet.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c index f162d59d816..2078a277e06 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c | |||
| @@ -2228,8 +2228,6 @@ static int packet_ioctl(struct socket *sock, unsigned int cmd, | |||
| 2228 | case SIOCGIFDSTADDR: | 2228 | case SIOCGIFDSTADDR: |
| 2229 | case SIOCSIFDSTADDR: | 2229 | case SIOCSIFDSTADDR: |
| 2230 | case SIOCSIFFLAGS: | 2230 | case SIOCSIFFLAGS: |
| 2231 | if (!net_eq(sock_net(sk), &init_net)) | ||
| 2232 | return -ENOIOCTLCMD; | ||
| 2233 | return inet_dgram_ops.ioctl(sock, cmd, arg); | 2231 | return inet_dgram_ops.ioctl(sock, cmd, arg); |
| 2234 | #endif | 2232 | #endif |
| 2235 | 2233 | ||