diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2011-11-02 23:56:40 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2011-11-02 23:56:40 -0400 |
| commit | 31cbecb4ab538f433145bc5a46f3bea9b9627031 (patch) | |
| tree | d6206d42dea7298f7ef05fd1f7bf474245f0d43a /net/dsa | |
| parent | 2b72c9ccd22c4a3299e5a358dcd639fb253730f4 (diff) | |
| parent | 278c023a99b0d6b471d0f4a79835c703482e29ac (diff) | |
Merge branch 'osd-devel' into nfs-for-next
Diffstat (limited to 'net/dsa')
| -rw-r--r-- | net/dsa/slave.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/net/dsa/slave.c b/net/dsa/slave.c index 0a47b6c37038..56cf9b8e1c7c 100644 --- a/net/dsa/slave.c +++ b/net/dsa/slave.c | |||
| @@ -301,7 +301,6 @@ static const struct net_device_ops dsa_netdev_ops = { | |||
| 301 | .ndo_start_xmit = dsa_xmit, | 301 | .ndo_start_xmit = dsa_xmit, |
| 302 | .ndo_change_rx_flags = dsa_slave_change_rx_flags, | 302 | .ndo_change_rx_flags = dsa_slave_change_rx_flags, |
| 303 | .ndo_set_rx_mode = dsa_slave_set_rx_mode, | 303 | .ndo_set_rx_mode = dsa_slave_set_rx_mode, |
| 304 | .ndo_set_multicast_list = dsa_slave_set_rx_mode, | ||
| 305 | .ndo_set_mac_address = dsa_slave_set_mac_address, | 304 | .ndo_set_mac_address = dsa_slave_set_mac_address, |
| 306 | .ndo_do_ioctl = dsa_slave_ioctl, | 305 | .ndo_do_ioctl = dsa_slave_ioctl, |
| 307 | }; | 306 | }; |
| @@ -314,7 +313,6 @@ static const struct net_device_ops edsa_netdev_ops = { | |||
| 314 | .ndo_start_xmit = edsa_xmit, | 313 | .ndo_start_xmit = edsa_xmit, |
| 315 | .ndo_change_rx_flags = dsa_slave_change_rx_flags, | 314 | .ndo_change_rx_flags = dsa_slave_change_rx_flags, |
| 316 | .ndo_set_rx_mode = dsa_slave_set_rx_mode, | 315 | .ndo_set_rx_mode = dsa_slave_set_rx_mode, |
| 317 | .ndo_set_multicast_list = dsa_slave_set_rx_mode, | ||
| 318 | .ndo_set_mac_address = dsa_slave_set_mac_address, | 316 | .ndo_set_mac_address = dsa_slave_set_mac_address, |
| 319 | .ndo_do_ioctl = dsa_slave_ioctl, | 317 | .ndo_do_ioctl = dsa_slave_ioctl, |
| 320 | }; | 318 | }; |
| @@ -327,7 +325,6 @@ static const struct net_device_ops trailer_netdev_ops = { | |||
| 327 | .ndo_start_xmit = trailer_xmit, | 325 | .ndo_start_xmit = trailer_xmit, |
| 328 | .ndo_change_rx_flags = dsa_slave_change_rx_flags, | 326 | .ndo_change_rx_flags = dsa_slave_change_rx_flags, |
| 329 | .ndo_set_rx_mode = dsa_slave_set_rx_mode, | 327 | .ndo_set_rx_mode = dsa_slave_set_rx_mode, |
| 330 | .ndo_set_multicast_list = dsa_slave_set_rx_mode, | ||
| 331 | .ndo_set_mac_address = dsa_slave_set_mac_address, | 328 | .ndo_set_mac_address = dsa_slave_set_mac_address, |
| 332 | .ndo_do_ioctl = dsa_slave_ioctl, | 329 | .ndo_do_ioctl = dsa_slave_ioctl, |
| 333 | }; | 330 | }; |