Merge tag 'xfs-for-linus-v3.14-rc1-2' of git://oss.sgi.com/xfs/xfs

[~andy/linux] / net / mac802154 / wpan.c

diff --git a/net/mac802154/wpan.c b/net/mac802154/wpan.c
index e24bcf9772968d9e5a8dc59bbc8597dc2dfca1e8..372d8a222b9184e2881d108a087cf9ebaad768e6 100644 (file)
--- a/net/mac802154/wpan.c
+++ b/net/mac802154/wpan.c
@@ -444,8 +444,8 @@ mac802154_subif_frame(struct mac802154_sub_if_data *sdata, struct sk_buff *skb)
        case IEEE802154_FC_TYPE_DATA:
                return mac802154_process_data(sdata->dev, skb);
        default:
-               pr_warning("ieee802154: bad frame received (type = %d)\n",
-                          mac_cb_type(skb));
+               pr_warn("ieee802154: bad frame received (type = %d)\n",
+                       mac_cb_type(skb));
                kfree_skb(skb);
                return NET_RX_DROP;
        }