Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 315422
b: refs/heads/master
c: 525a940
h: refs/heads/master
v: v3
  • Loading branch information
Alexander Duyck authored and Jeff Kirsher committed Jul 17, 2012
1 parent 6b71272 commit b2e2954
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 21 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: fd13a9abeb8d487e2a3cfd2166542c180d33acc9
refs/heads/master: 525a940c37c706155dc6726582d6430c148d9f8b
3 changes: 1 addition & 2 deletions trunk/drivers/net/ethernet/intel/ixgbevf/ixgbevf.h
Original file line number Diff line number Diff line change
Expand Up @@ -207,8 +207,7 @@ struct ixgbevf_adapter {
* thus the additional *_CAPABLE flags.
*/
u32 flags;
#define IXGBE_FLAG_RX_CSUM_ENABLED (u32)(1)
#define IXGBE_FLAG_IN_WATCHDOG_TASK (u32)(1 << 1)
#define IXGBE_FLAG_IN_WATCHDOG_TASK (u32)(1)

/* OS defined structs */
struct net_device *netdev;
Expand Down
19 changes: 1 addition & 18 deletions trunk/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ static inline void ixgbevf_rx_checksum(struct ixgbevf_adapter *adapter,
skb_checksum_none_assert(skb);

/* Rx csum disabled */
if (!(adapter->flags & IXGBE_FLAG_RX_CSUM_ENABLED))
if (!(adapter->netdev->features & NETIF_F_RXCSUM))
return;

/* if IP and error */
Expand Down Expand Up @@ -2077,9 +2077,6 @@ static int __devinit ixgbevf_sw_init(struct ixgbevf_adapter *adapter)
adapter->tx_ring_count = IXGBEVF_DEFAULT_TXD;
adapter->rx_ring_count = IXGBEVF_DEFAULT_RXD;

/* enable rx csum by default */
adapter->flags |= IXGBE_FLAG_RX_CSUM_ENABLED;

set_bit(__IXGBEVF_DOWN, &adapter->state);
return 0;

Expand Down Expand Up @@ -3112,19 +3109,6 @@ static struct rtnl_link_stats64 *ixgbevf_get_stats(struct net_device *netdev,
return stats;
}

static int ixgbevf_set_features(struct net_device *netdev,
netdev_features_t features)
{
struct ixgbevf_adapter *adapter = netdev_priv(netdev);

if (features & NETIF_F_RXCSUM)
adapter->flags |= IXGBE_FLAG_RX_CSUM_ENABLED;
else
adapter->flags &= ~IXGBE_FLAG_RX_CSUM_ENABLED;

return 0;
}

static const struct net_device_ops ixgbe_netdev_ops = {
.ndo_open = ixgbevf_open,
.ndo_stop = ixgbevf_close,
Expand All @@ -3137,7 +3121,6 @@ static const struct net_device_ops ixgbe_netdev_ops = {
.ndo_tx_timeout = ixgbevf_tx_timeout,
.ndo_vlan_rx_add_vid = ixgbevf_vlan_rx_add_vid,
.ndo_vlan_rx_kill_vid = ixgbevf_vlan_rx_kill_vid,
.ndo_set_features = ixgbevf_set_features,
};

static void ixgbevf_assign_netdev_ops(struct net_device *dev)
Expand Down

0 comments on commit b2e2954

Please sign in to comment.