| commit | 7145074b374dd90a4512fe52c062b336b724f276 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Fri Mar 27 14:26:21 2015 -0700 |
| committer | David S. Miller <davem@davemloft.net> | Fri Mar 27 14:26:21 2015 -0700 |
| tree | 1ffcc5ab7dd245e0f828c34b27fad2adcf00ff18 | |
| parent | 19cc2dec8ab0fd258b023be1835aa8d710232877 [diff] | |
| parent | 4055eaefb3603a2a55305c81292379922a742131 [diff] |
Merge branch 'bcmgenet-next' Petri Gynther says: ==================== net: bcmgenet: multiple Rx queues support Final patch set to add support for multiple Rx queues: 1. remove priv->int0_mask and priv->int1_mask 2. modify Tx ring int_enable and int_disable vectors 3. simplify bcmgenet_init_dma() 4. tweak init_umac() 5. rework Tx NAPI code 6. rework Rx NAPI code 7. add support for multiple Rx queues ==================== Signed-off-by: David S. Miller <davem@davemloft.net>