summaryrefslogtreecommitdiffstats
path: root/net/bridge/br_input.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2014-04-12 16:36:44 -0400
committerDavid S. Miller <davem@davemloft.net>2014-04-12 16:36:44 -0400
commitdcfba949ba4ff90f5a7ff2942a4c86f9e2ba345d (patch)
tree032da70dd9091162fa7c88f0305b1f4b94cff1fd /net/bridge/br_input.c
parent0f2eea4b7e29ab693b07f6eedf8e87a0c11b8b42 (diff)
parent5b7af02c26d84cf56dfd7e6906e244e31e92d593 (diff)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net
Jeff Kirsher says: ==================== Intel Wired LAN Driver Updates This series contains updates to e1000, e1000e, igb, igbvf, ixgb, ixgbe, ixgbevf and i40evf. Mark fixes an issue with ixgbe and ixgbevf by adding a bit to indicate when workqueues have been initialized. This permits the register read error handling from attempting to use them prior to that, which also generates warnings. Checking for a detected removal after initializing the work queues allows the probe function to return an error without getting the workqueue involved. Further, if the error_detected callback is entered before the workqueues are initialized, exit without recovery since the device initialization was so truncated. Francois Romieu provides several patches to all the drivers to remove the open coded skb_cow_head. Jakub Kicinski provides a fix for igb where last_rx_timestamp should be updated only when Rx time stamp is read. Mitch provides a fix for i40evf where a recent change broke the RSS LUT programming causing it to be programmed with all 0's. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge/br_input.c')
0 files changed, 0 insertions, 0 deletions