diff --git a/[refs] b/[refs] index 00e32a29c75a..89efa10d11bf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c2a10d70f2c84459152ba7de164701cabff53043 +refs/heads/master: 44c0186d0c7cf589ba96d7f59246b040dc7408f1 diff --git a/trunk/drivers/staging/netlogic/xlr_net.c b/trunk/drivers/staging/netlogic/xlr_net.c index efc6172b73b6..dd98cb1468a4 100644 --- a/trunk/drivers/staging/netlogic/xlr_net.c +++ b/trunk/drivers/staging/netlogic/xlr_net.c @@ -293,10 +293,8 @@ static netdev_tx_t xlr_net_start_xmit(struct sk_buff *skb, struct nlm_fmn_msg msg; struct xlr_net_priv *priv = netdev_priv(ndev); int ret; - u16 qmap; u32 flags; - qmap = skb->queue_mapping; xlr_make_tx_desc(&msg, virt_to_phys(skb->data), skb); flags = nlm_cop2_enable(); ret = nlm_fmn_send(2, 0, priv->nd->tx_stnid, &msg);