diff --git a/[refs] b/[refs]
index 80a4c2bf0623..7f7f540e29b6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0ca5f319f4bef00d31a21614345ecd5ea0ca8afd
+refs/heads/master: ba596a01886b236c8171fc28d53842da0128224e
diff --git a/trunk/drivers/net/cpmac.c b/trunk/drivers/net/cpmac.c
index 6fd95a2c8cec..6e12d48351b8 100644
--- a/trunk/drivers/net/cpmac.c
+++ b/trunk/drivers/net/cpmac.c
@@ -459,7 +459,7 @@ static int cpmac_start_xmit(struct sk_buff *skb, struct net_device *dev)
 		return NETDEV_TX_OK;
 
 	len = max(skb->len, ETH_ZLEN);
-	queue = skb->queue_mapping;
+	queue = skb_get_queue_mapping(skb);
 #ifdef CONFIG_NETDEVICES_MULTIQUEUE
 	netif_stop_subqueue(dev, queue);
 #else