diff options
| author | Matthew Wilcox (Oracle) <willy@infradead.org> | 2019-07-22 20:08:25 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-07-22 20:47:56 -0700 |
| commit | d7840976e3915669382c62ddd1700960f348328e (patch) | |
| tree | 56dc7cc1ae1efc1c947fec907f1bf6775d85a774 /drivers/net/ethernet/jme.c | |
| parent | 7e24b4ed5ac4321e41415b0c6f0f8a8ac14852b2 (diff) | |
| download | lwn-d7840976e3915669382c62ddd1700960f348328e.tar.gz lwn-d7840976e3915669382c62ddd1700960f348328e.zip | |
net: Use skb accessors in network drivers
In preparation for unifying the skb_frag and bio_vec, use the fine
accessors which already exist and use skb_frag_t instead of
struct skb_frag_struct.
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/jme.c')
| -rw-r--r-- | drivers/net/ethernet/jme.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/ethernet/jme.c b/drivers/net/ethernet/jme.c index 0b668357db4d..ff6393fd64ac 100644 --- a/drivers/net/ethernet/jme.c +++ b/drivers/net/ethernet/jme.c @@ -2030,12 +2030,12 @@ jme_map_tx_skb(struct jme_adapter *jme, struct sk_buff *skb, int idx) bool hidma = jme->dev->features & NETIF_F_HIGHDMA; int i, nr_frags = skb_shinfo(skb)->nr_frags; int mask = jme->tx_ring_mask; - const struct skb_frag_struct *frag; u32 len; int ret = 0; for (i = 0 ; i < nr_frags ; ++i) { - frag = &skb_shinfo(skb)->frags[i]; + const skb_frag_t *frag = &skb_shinfo(skb)->frags[i]; + ctxdesc = txdesc + ((idx + i + 2) & (mask)); ctxbi = txbi + ((idx + i + 2) & (mask)); @@ -2046,7 +2046,6 @@ jme_map_tx_skb(struct jme_adapter *jme, struct sk_buff *skb, int idx) jme_drop_tx_map(jme, idx, i); goto out; } - } len = skb_is_nonlinear(skb) ? skb_headlen(skb) : skb->len; |