diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-24 12:33:52 -0800 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-24 12:33:52 -0800 |
commit | b42060069faa0daf7915acec4f31e4a46bca3b32 (patch) | |
tree | e403a7948aedea5897fd3118da0ff1c9926690a7 /drivers/staging/bcm | |
parent | aa256f8d0dd9c2dff872849418d8e09e5d06718f (diff) | |
parent | cfbf8d4857c26a8a307fb7cd258074c9dcd8c691 (diff) |
Merge 3.14-rc4 into staging-next.
We want those fixes here as well.
Diffstat (limited to 'drivers/staging/bcm')
-rw-r--r-- | drivers/staging/bcm/Bcmnet.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/bcm/Bcmnet.c b/drivers/staging/bcm/Bcmnet.c index 8dfdd2732bdc..95a2358267ba 100644 --- a/drivers/staging/bcm/Bcmnet.c +++ b/drivers/staging/bcm/Bcmnet.c @@ -40,7 +40,7 @@ static INT bcm_close(struct net_device *dev) } static u16 bcm_select_queue(struct net_device *dev, struct sk_buff *skb, - void *accel_priv) + void *accel_priv, select_queue_fallback_t fallback) { return ClassifyPacket(netdev_priv(dev), skb); } |