diff options
| author | David S. Miller <davem@davemloft.net> | 2009-03-17 18:01:30 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-17 18:01:30 -0400 |
| commit | 2d6a5e9500103680464a723a4564961675652680 (patch) | |
| tree | d18903333aae8a4415b179d6e7d38f203724892c /drivers/net/ixgbe | |
| parent | bd257ed9f1d129b4e881f513a406b435c8852565 (diff) | |
| parent | f10023a4ef3f5cc05457b059c6880bc447adfa1f (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/igb/igb_main.c
drivers/net/qlge/qlge_main.c
drivers/net/wireless/ath9k/ath9k.h
drivers/net/wireless/ath9k/core.h
drivers/net/wireless/ath9k/hw.c
Diffstat (limited to 'drivers/net/ixgbe')
| -rw-r--r-- | drivers/net/ixgbe/ixgbe_main.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c index 0b2b609fad85..335119a5687a 100644 --- a/drivers/net/ixgbe/ixgbe_main.c +++ b/drivers/net/ixgbe/ixgbe_main.c | |||
| @@ -4402,6 +4402,7 @@ static const struct net_device_ops ixgbe_netdev_ops = { | |||
| 4402 | .ndo_stop = ixgbe_close, | 4402 | .ndo_stop = ixgbe_close, |
| 4403 | .ndo_start_xmit = ixgbe_xmit_frame, | 4403 | .ndo_start_xmit = ixgbe_xmit_frame, |
| 4404 | .ndo_get_stats = ixgbe_get_stats, | 4404 | .ndo_get_stats = ixgbe_get_stats, |
| 4405 | .ndo_set_rx_mode = ixgbe_set_rx_mode, | ||
| 4405 | .ndo_set_multicast_list = ixgbe_set_rx_mode, | 4406 | .ndo_set_multicast_list = ixgbe_set_rx_mode, |
| 4406 | .ndo_validate_addr = eth_validate_addr, | 4407 | .ndo_validate_addr = eth_validate_addr, |
| 4407 | .ndo_set_mac_address = ixgbe_set_mac, | 4408 | .ndo_set_mac_address = ixgbe_set_mac, |