diff options
| author | David S. Miller <davem@davemloft.net> | 2019-04-18 17:06:15 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-04-18 17:06:15 -0700 |
| commit | 8a99aa5d997fd6b635816a0a372db307a414a224 (patch) | |
| tree | 18feeb128c4ec168d1a3c3c44f784e6f6a31bcdf /include/linux | |
| parent | 0bc199854405543b0debe67c735c0aae94f1d319 (diff) | |
| parent | a06eaaf7913cab9dd6cb8ece4f78cfd7a802872a (diff) | |
Merge branch 'net-some-build-fixes-and-other-improvements'
Jakub Kicinski says:
====================
net: some build fixes and other improvements
A few unrelated improvements here, mostly trying to make random
configs build and W=1 produce a little less warnings under net/
and drivers net/.
First two patches fix set but not used warnings with W=1.
Next patch fixes 64bit division in sch_taprio.c.
Last two patches are getting rid of some (almost) unused asserts
in skbuff.h.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/skbuff.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index a06275a618f0..e4ee92089dd6 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -2100,8 +2100,6 @@ void skb_add_rx_frag(struct sk_buff *skb, int i, struct page *page, int off, void skb_coalesce_rx_frag(struct sk_buff *skb, int i, int size, unsigned int truesize); -#define SKB_PAGE_ASSERT(skb) BUG_ON(skb_shinfo(skb)->nr_frags) -#define SKB_FRAG_ASSERT(skb) BUG_ON(skb_has_frag_list(skb)) #define SKB_LINEAR_ASSERT(skb) BUG_ON(skb_is_nonlinear(skb)) #ifdef NET_SKBUFF_DATA_USES_OFFSET |