diff options
| author | David S. Miller <davem@davemloft.net> | 2020-09-25 17:04:56 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-09-25 17:04:56 -0700 |
| commit | dc171dcf8a93db642bcbf246a7bddd6d4e0ff84a (patch) | |
| tree | 2d34a726c9e7d6b2c64c0c5859b61b418d45e6df | |
| parent | 4663ff60257aec4ee1e2e969a7c046f0aff35ab8 (diff) | |
| parent | 89d01748b2354e210b5d4ea47bc25a42a1b42c82 (diff) | |
Merge branch 'bonding-team-basic-dev-needed_headroom-support'
Eric Dumazet says:
====================
bonding/team: basic dev->needed_headroom support
Both bonding and team drivers support non-ethernet devices,
but missed proper dev->needed_headroom initializations.
syzbot found a crash caused by bonding, I mirrored the fix in team as well.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/bonding/bond_main.c | 1 | ||||
| -rw-r--r-- | drivers/net/team/team.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 42ef25ec0af5..14740d3053b8 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -1315,6 +1315,7 @@ static void bond_setup_by_slave(struct net_device *bond_dev, bond_dev->type = slave_dev->type; bond_dev->hard_header_len = slave_dev->hard_header_len; + bond_dev->needed_headroom = slave_dev->needed_headroom; bond_dev->addr_len = slave_dev->addr_len; memcpy(bond_dev->broadcast, slave_dev->broadcast, diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c index 8c1e02752ff6..69dfb1a49cc8 100644 --- a/drivers/net/team/team.c +++ b/drivers/net/team/team.c @@ -2112,6 +2112,7 @@ static void team_setup_by_port(struct net_device *dev, dev->header_ops = port_dev->header_ops; dev->type = port_dev->type; dev->hard_header_len = port_dev->hard_header_len; + dev->needed_headroom = port_dev->needed_headroom; dev->addr_len = port_dev->addr_len; dev->mtu = port_dev->mtu; memcpy(dev->broadcast, port_dev->broadcast, port_dev->addr_len); |