diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-01-12 11:56:29 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-01-12 11:56:29 -0500 |
| commit | da4540757d35a98a350d6e8d882a64b2d04f8581 (patch) | |
| tree | ad77d8752f5db40497c819f051cbae12effb8163 /drivers/net/ethernet/tile/tilegx.c | |
| parent | cc131eef1cec905b9bdb0be6d7ab3af86f23de98 (diff) | |
| parent | 7e22e91102c6b9df7c4ae2168910e19d2bb14cd6 (diff) | |
Merge tag 'v3.13-rc8' into x86/ras, to pick up fixes.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/net/ethernet/tile/tilegx.c')
| -rw-r--r-- | drivers/net/ethernet/tile/tilegx.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/tile/tilegx.c b/drivers/net/ethernet/tile/tilegx.c index 628b736e5ae7..0e9fb3301b11 100644 --- a/drivers/net/ethernet/tile/tilegx.c +++ b/drivers/net/ethernet/tile/tilegx.c | |||
| @@ -2080,7 +2080,8 @@ static int tile_net_tx(struct sk_buff *skb, struct net_device *dev) | |||
| 2080 | } | 2080 | } |
| 2081 | 2081 | ||
| 2082 | /* Return subqueue id on this core (one per core). */ | 2082 | /* Return subqueue id on this core (one per core). */ |
| 2083 | static u16 tile_net_select_queue(struct net_device *dev, struct sk_buff *skb) | 2083 | static u16 tile_net_select_queue(struct net_device *dev, struct sk_buff *skb, |
| 2084 | void *accel_priv) | ||
| 2084 | { | 2085 | { |
| 2085 | return smp_processor_id(); | 2086 | return smp_processor_id(); |
| 2086 | } | 2087 | } |