From 4bcfcd757400139a8ebc398f11f6620cdcb50ebf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= Date: Tue, 17 Jan 2012 10:00:40 +0000 Subject: [PATCH] --- yaml --- r: 286213 b: refs/heads/master c: 65e9d2faab70d07b9a38ac6ed298f191d24541fc h: refs/heads/master i: 286211: 6e24a4c3ddffdce2da502ab43ed5267c775dd9c5 v: v3 --- [refs] | 2 +- trunk/net/core/dev.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 86020657808b..f67c50682b4f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 36c92474498ad6cc3afb24b91a67a444d79978fe +refs/heads/master: 65e9d2faab70d07b9a38ac6ed298f191d24541fc diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c index 17db2f2e5236..115dee1d985d 100644 --- a/trunk/net/core/dev.c +++ b/trunk/net/core/dev.c @@ -1889,6 +1889,7 @@ EXPORT_SYMBOL(skb_set_dev); static void skb_warn_bad_offload(const struct sk_buff *skb) { + static const netdev_features_t null_features = 0; struct net_device *dev = skb->dev; const char *driver = ""; @@ -1897,8 +1898,8 @@ static void skb_warn_bad_offload(const struct sk_buff *skb) WARN(1, "%s: caps=(%pNF, %pNF) len=%d data_len=%d gso_size=%d " "gso_type=%d ip_summed=%d\n", - driver, dev ? &dev->features : NULL, - skb->sk ? &skb->sk->sk_route_caps : NULL, + driver, dev ? &dev->features : &null_features, + skb->sk ? &skb->sk->sk_route_caps : &null_features, skb->len, skb->data_len, skb_shinfo(skb)->gso_size, skb_shinfo(skb)->gso_type, skb->ip_summed); }