diff options
| author | David S. Miller <davem@davemloft.net> | 2016-06-30 05:03:36 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-06-30 05:03:36 -0400 |
| commit | ee58b57100ca953da7320c285315a95db2f7053d (patch) | |
| tree | 77b815a31240adc4d6326346908137fc6c2c3a96 /include/linux/qed | |
| parent | 6f30e8b022c8e3a722928ddb1a2ae0be852fcc0e (diff) | |
| parent | e7bdea7750eb2a64aea4a08fa5c0a31719c8155d (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Several cases of overlapping changes, except the packet scheduler
conflicts which deal with the addition of the free list parameter
to qdisc_enqueue().
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/qed')
| -rw-r--r-- | include/linux/qed/qed_eth_if.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/qed/qed_eth_if.h b/include/linux/qed/qed_eth_if.h index 71d523b4bc54..4475a9d8ae15 100644 --- a/include/linux/qed/qed_eth_if.h +++ b/include/linux/qed/qed_eth_if.h | |||
| @@ -49,6 +49,7 @@ struct qed_start_vport_params { | |||
| 49 | bool drop_ttl0; | 49 | bool drop_ttl0; |
| 50 | u8 vport_id; | 50 | u8 vport_id; |
| 51 | u16 mtu; | 51 | u16 mtu; |
| 52 | bool clear_stats; | ||
| 52 | }; | 53 | }; |
| 53 | 54 | ||
| 54 | struct qed_stop_rxq_params { | 55 | struct qed_stop_rxq_params { |