diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-03-02 23:09:08 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-03-02 23:09:08 -0500 |
| commit | 13df7977431e3b906a23bb75f29e0f40a8d73f87 (patch) | |
| tree | bc2c78c3b816a65f90c31cccebdc15b38352c045 /drivers/net/ethernet/tile/tilegx.c | |
| parent | 6d8b3e1ad3d3815d9c87b8553493301e243af76a (diff) | |
| parent | 0414855fdc4a40da05221fc6062cccbc0c30f169 (diff) | |
Merge 3.14-rc5 into driver-core-next
We want the fixes in here.
Diffstat (limited to 'drivers/net/ethernet/tile/tilegx.c')
| -rw-r--r-- | drivers/net/ethernet/tile/tilegx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/tile/tilegx.c b/drivers/net/ethernet/tile/tilegx.c index 023237a65720..17503da9f7a5 100644 --- a/drivers/net/ethernet/tile/tilegx.c +++ b/drivers/net/ethernet/tile/tilegx.c | |||
| @@ -2071,7 +2071,7 @@ static int tile_net_tx(struct sk_buff *skb, struct net_device *dev) | |||
| 2071 | 2071 | ||
| 2072 | /* Return subqueue id on this core (one per core). */ | 2072 | /* Return subqueue id on this core (one per core). */ |
| 2073 | static u16 tile_net_select_queue(struct net_device *dev, struct sk_buff *skb, | 2073 | static u16 tile_net_select_queue(struct net_device *dev, struct sk_buff *skb, |
| 2074 | void *accel_priv) | 2074 | void *accel_priv, select_queue_fallback_t fallback) |
| 2075 | { | 2075 | { |
| 2076 | return smp_processor_id(); | 2076 | return smp_processor_id(); |
| 2077 | } | 2077 | } |