diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-04-26 15:05:39 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-04-26 15:05:39 +0200 |
| commit | 31d44b57c508971c083ce038d7c5ededd09cea01 (patch) | |
| tree | 249689625896d65894f56763c22f726e39fde5ec /drivers/net/netxen/netxen_nic_ethtool.c | |
| parent | 885f42e1f466c36e3663d912a831e940f01a112b (diff) | |
| parent | 1c7276cfc04b1a5b296b691c2e07297a4f6c19aa (diff) | |
Merge branch 'fix/hda' into topic/hda
Diffstat (limited to 'drivers/net/netxen/netxen_nic_ethtool.c')
| -rw-r--r-- | drivers/net/netxen/netxen_nic_ethtool.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/netxen/netxen_nic_ethtool.c b/drivers/net/netxen/netxen_nic_ethtool.c index 653d308e0f5..3bdcc803ec6 100644 --- a/drivers/net/netxen/netxen_nic_ethtool.c +++ b/drivers/net/netxen/netxen_nic_ethtool.c @@ -871,7 +871,7 @@ static int netxen_nic_set_flags(struct net_device *netdev, u32 data) struct netxen_adapter *adapter = netdev_priv(netdev); int hw_lro; - if (data & ~ETH_FLAG_LRO) + if (ethtool_invalid_flags(netdev, data, ETH_FLAG_LRO)) return -EINVAL; if (!(adapter->capabilities & NX_FW_CAPABILITY_HW_LRO)) |