From: Andrew Morton <akpm@osdl.org>

Fix for gregkh driver tree depredations.

Cc: Christoph Hellwig <hch@lst.de>
Cc: Christoph Lameter <clameter@engr.sgi.com>
Cc: "David S. Miller" <davem@davemloft.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 net/core/skbuff.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff -puN net/core/skbuff.c~node-aware-skb-allocation-fix-for-device-tree-changes net/core/skbuff.c
--- a/net/core/skbuff.c~node-aware-skb-allocation-fix-for-device-tree-changes
+++ a/net/core/skbuff.c
@@ -288,7 +288,7 @@ nodata:
 struct sk_buff *__netdev_alloc_skb(struct net_device *dev,
 		unsigned int length, gfp_t gfp_mask)
 {
-	int node = dev->class_dev.dev ? dev_to_node(dev->class_dev.dev) : -1;
+	int node = dev_to_node(&dev->dev);
 	struct sk_buff *skb;
 
  	skb = __alloc_skb(length + NET_SKB_PAD, gfp_mask, 0, node);
_