diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2020-10-09 01:44:50 +0300 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2020-10-09 01:44:50 +0300 |
| commit | 9d49aea13f1e35869158abe7e314e16dc8f50ff1 (patch) | |
| tree | c878d774db35fdb9834621e2f354973dc09f2702 /drivers/net/macsec.c | |
| parent | 9faebeb2d80065926dfbc09cb73b1bb7779a89cd (diff) | |
| parent | 3fdd47c3b40ac48e6e6e5904cf24d12e6e073a96 (diff) | |
| download | linux-9d49aea13f1e35869158abe7e314e16dc8f50ff1.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Small conflict around locking in rxrpc_process_event() -
channel_lock moved to bundle in next, while state lock
needs _bh() from net.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/net/macsec.c')
| -rw-r--r-- | drivers/net/macsec.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/macsec.c b/drivers/net/macsec.c index 3f4d8c6625de..2b0c8f01ddc3 100644 --- a/drivers/net/macsec.c +++ b/drivers/net/macsec.c @@ -1077,6 +1077,7 @@ static rx_handler_result_t macsec_handle_frame(struct sk_buff **pskb) struct macsec_rx_sa *rx_sa; struct macsec_rxh_data *rxd; struct macsec_dev *macsec; + unsigned int len; sci_t sci; u32 hdr_pn; bool cbit; @@ -1232,9 +1233,10 @@ deliver: macsec_rxsc_put(rx_sc); skb_orphan(skb); + len = skb->len; ret = gro_cells_receive(&macsec->gro_cells, skb); if (ret == NET_RX_SUCCESS) - count_rx(dev, skb->len); + count_rx(dev, len); else macsec->secy.netdev->stats.rx_dropped++; |