diff options
| author | James Morris <james.morris@microsoft.com> | 2019-01-22 23:33:10 +0100 |
|---|---|---|
| committer | James Morris <james.morris@microsoft.com> | 2019-01-22 23:33:10 +0100 |
| commit | 9624d5c9c7ff6836bbf9f9b230fd1fcf3d56f91a (patch) | |
| tree | e9c1e5d2400ad20c5a9cd633b52a42a00d1d98cb /drivers/net/ethernet/cadence | |
| parent | LSM: Make some functions static (diff) | |
| parent | Linux 5.0-rc3 (diff) | |
| download | linux-9624d5c9c7ff6836bbf9f9b230fd1fcf3d56f91a.tar.xz linux-9624d5c9c7ff6836bbf9f9b230fd1fcf3d56f91a.zip | |
Merge tag 'v5.0-rc3' into next-general
Sync to Linux 5.0-rc3 to pull in the VFS changes which impacted a lot
of the LSM code.
Diffstat (limited to 'drivers/net/ethernet/cadence')
| -rw-r--r-- | drivers/net/ethernet/cadence/macb_main.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c index b126926ef7f5..66cc7927061a 100644 --- a/drivers/net/ethernet/cadence/macb_main.c +++ b/drivers/net/ethernet/cadence/macb_main.c @@ -1738,12 +1738,8 @@ static int macb_pad_and_fcs(struct sk_buff **skb, struct net_device *ndev) *skb = nskb; } - if (padlen) { - if (padlen >= ETH_FCS_LEN) - skb_put_zero(*skb, padlen - ETH_FCS_LEN); - else - skb_trim(*skb, ETH_FCS_LEN - padlen); - } + if (padlen > ETH_FCS_LEN) + skb_put_zero(*skb, padlen - ETH_FCS_LEN); add_fcs: /* set FCS to packet */ |