summaryrefslogtreecommitdiffstats
path: root/drivers/net/ixgbe/ixgbe_main.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-03-18 10:37:43 +0100
committerIngo Molnar <mingo@elte.hu>2009-03-18 10:37:43 +0100
commit04dfcfcb54b073133bcca2c8f25b55e904558931 (patch)
tree123d13f9e242751f629924e92fcb297dc669d767 /drivers/net/ixgbe/ixgbe_main.c
parentMerge branch 'iommu/fixes-2.6.29' of git://git.kernel.org/pub/scm/linux/kerne... (diff)
parentAvoid 64-bit "switch()" statements on 32-bit architectures (diff)
downloadlinux-04dfcfcb54b073133bcca2c8f25b55e904558931.tar.xz
linux-04dfcfcb54b073133bcca2c8f25b55e904558931.zip
Merge branch 'linus' into core/iommu
Diffstat (limited to 'drivers/net/ixgbe/ixgbe_main.c')
-rw-r--r--drivers/net/ixgbe/ixgbe_main.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index d2f4d5f508b7..5d364a96e35d 100644
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -3973,6 +3973,7 @@ static const struct net_device_ops ixgbe_netdev_ops = {
.ndo_stop = ixgbe_close,
.ndo_start_xmit = ixgbe_xmit_frame,
.ndo_get_stats = ixgbe_get_stats,
+ .ndo_set_rx_mode = ixgbe_set_rx_mode,
.ndo_set_multicast_list = ixgbe_set_rx_mode,
.ndo_validate_addr = eth_validate_addr,
.ndo_set_mac_address = ixgbe_set_mac,