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>
This commit is contained in:
@@ -49,6 +49,7 @@ struct qed_start_vport_params {
|
||||
bool drop_ttl0;
|
||||
u8 vport_id;
|
||||
u16 mtu;
|
||||
bool clear_stats;
|
||||
};
|
||||
|
||||
struct qed_stop_rxq_params {
|
||||
|
Reference in New Issue
Block a user