diff options
author | David S. Miller <davem@davemloft.net> | 2014-04-24 13:19:00 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-04-24 13:19:00 -0400 |
commit | 4366004d77278a90c18f92f7cb9ec0c264da563d (patch) | |
tree | 4fb046b6b06cc681f791a8ddf7507b5f8eb99be8 /drivers/net/ethernet/intel/e1000e/netdev.c | |
parent | e9f0fb88493570200b8dc1cc02d3e676412d25bc (diff) | |
parent | a450a685791d12c0a477b75d630d6ae66acab9a7 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/intel/igb/e1000_mac.c
net/core/filter.c
Both conflicts were simple overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/intel/e1000e/netdev.c')
-rw-r--r-- | drivers/net/ethernet/intel/e1000e/netdev.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c index 1d32c9742461..e4207efd13f8 100644 --- a/drivers/net/ethernet/intel/e1000e/netdev.c +++ b/drivers/net/ethernet/intel/e1000e/netdev.c | |||
@@ -1167,7 +1167,7 @@ static void e1000e_tx_hwtstamp_work(struct work_struct *work) | |||
1167 | dev_kfree_skb_any(adapter->tx_hwtstamp_skb); | 1167 | dev_kfree_skb_any(adapter->tx_hwtstamp_skb); |
1168 | adapter->tx_hwtstamp_skb = NULL; | 1168 | adapter->tx_hwtstamp_skb = NULL; |
1169 | adapter->tx_hwtstamp_timeouts++; | 1169 | adapter->tx_hwtstamp_timeouts++; |
1170 | e_warn("clearing Tx timestamp hang"); | 1170 | e_warn("clearing Tx timestamp hang\n"); |
1171 | } else { | 1171 | } else { |
1172 | /* reschedule to check later */ | 1172 | /* reschedule to check later */ |
1173 | schedule_work(&adapter->tx_hwtstamp_work); | 1173 | schedule_work(&adapter->tx_hwtstamp_work); |
@@ -5698,7 +5698,7 @@ struct rtnl_link_stats64 *e1000e_get_stats64(struct net_device *netdev, | |||
5698 | static int e1000_change_mtu(struct net_device *netdev, int new_mtu) | 5698 | static int e1000_change_mtu(struct net_device *netdev, int new_mtu) |
5699 | { | 5699 | { |
5700 | struct e1000_adapter *adapter = netdev_priv(netdev); | 5700 | struct e1000_adapter *adapter = netdev_priv(netdev); |
5701 | int max_frame = new_mtu + ETH_HLEN + ETH_FCS_LEN; | 5701 | int max_frame = new_mtu + VLAN_HLEN + ETH_HLEN + ETH_FCS_LEN; |
5702 | 5702 | ||
5703 | /* Jumbo frame support */ | 5703 | /* Jumbo frame support */ |
5704 | if ((max_frame > ETH_FRAME_LEN + ETH_FCS_LEN) && | 5704 | if ((max_frame > ETH_FRAME_LEN + ETH_FCS_LEN) && |
@@ -6247,6 +6247,7 @@ static int __e1000_resume(struct pci_dev *pdev) | |||
6247 | return 0; | 6247 | return 0; |
6248 | } | 6248 | } |
6249 | 6249 | ||
6250 | #ifdef CONFIG_PM_SLEEP | ||
6250 | static int e1000e_pm_thaw(struct device *dev) | 6251 | static int e1000e_pm_thaw(struct device *dev) |
6251 | { | 6252 | { |
6252 | struct net_device *netdev = pci_get_drvdata(to_pci_dev(dev)); | 6253 | struct net_device *netdev = pci_get_drvdata(to_pci_dev(dev)); |
@@ -6267,7 +6268,6 @@ static int e1000e_pm_thaw(struct device *dev) | |||
6267 | return 0; | 6268 | return 0; |
6268 | } | 6269 | } |
6269 | 6270 | ||
6270 | #ifdef CONFIG_PM_SLEEP | ||
6271 | static int e1000e_pm_suspend(struct device *dev) | 6271 | static int e1000e_pm_suspend(struct device *dev) |
6272 | { | 6272 | { |
6273 | struct pci_dev *pdev = to_pci_dev(dev); | 6273 | struct pci_dev *pdev = to_pci_dev(dev); |