diff options
| author | David S. Miller <davem@davemloft.net> | 2009-03-27 18:37:57 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-27 18:37:57 -0400 |
| commit | 8ebaebca7e9d371d79088190990f95e95e225b6d (patch) | |
| tree | c6da30e6f7a2b98f20557d7d0ec78c0acb867b99 /drivers | |
| parent | bd14ba842cd29edbbd40e566194bd33cf0c92f6c (diff) | |
| parent | 7c757eb9f804782fb39d0ae2c1a88ffb9309138e (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/infiniband/hw/nes/nes_nic.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/infiniband/hw/nes/nes_nic.c b/drivers/infiniband/hw/nes/nes_nic.c index 8d3e4c6f237e..ecb1f6fd6276 100644 --- a/drivers/infiniband/hw/nes/nes_nic.c +++ b/drivers/infiniband/hw/nes/nes_nic.c | |||
| @@ -1602,8 +1602,6 @@ struct net_device *nes_netdev_init(struct nes_device *nesdev, | |||
| 1602 | netif_napi_add(netdev, &nesvnic->napi, nes_netdev_poll, 128); | 1602 | netif_napi_add(netdev, &nesvnic->napi, nes_netdev_poll, 128); |
| 1603 | nes_debug(NES_DBG_INIT, "Enabling VLAN Insert/Delete.\n"); | 1603 | nes_debug(NES_DBG_INIT, "Enabling VLAN Insert/Delete.\n"); |
| 1604 | netdev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX; | 1604 | netdev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX; |
| 1605 | netdev->vlan_rx_register = nes_netdev_vlan_rx_register; | ||
| 1606 | netdev->features |= NETIF_F_LLTX; | ||
| 1607 | 1605 | ||
| 1608 | /* Fill in the port structure */ | 1606 | /* Fill in the port structure */ |
| 1609 | nesvnic->netdev = netdev; | 1607 | nesvnic->netdev = netdev; |