renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-04 03:33:58 +08:00
Code

staging: vt6656: Replace dev_alloc_skb with netdev_alloc_skb.

Browse Source 
Remove code that points to netdev (pDevice/priv->dev)

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Malcolm Priestley 2014-02-28 23:58:33 +00:00 committed by Greg Kroah-Hartman
parent 5a30e0b658
commit 29263661f9
2 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/staging/vt6656/dpc.c
View File

@ -1227,14 +1227,13 @@ static int s_bAPModeRxData(struct vnt_private *pDevice, struct sk_buff *skb,
if (is_multicast_ether_addr((u8 *)(skb->data+cbHeaderOffset))) {
if (pMgmt->sNodeDBTable[0].bPSEnable) {
skbcpy = dev_alloc_skb((int)pDevice->rx_buf_sz);
skbcpy = netdev_alloc_skb(pDevice->dev, pDevice->rx_buf_sz);
// if any node in PS mode, buffer packet until DTIM.
if (skbcpy == NULL) {
DBG_PRT(MSG_LEVEL_NOTICE, KERN_INFO "relay multicast no skb available \n");
}
else {
skbcpy->dev = pDevice->dev;
skbcpy->len = FrameSize;
memcpy(skbcpy->data, skb->data+cbHeaderOffset, FrameSize);
skb_queue_tail(&(pMgmt->sNodeDBTable[0].sTxPSQueue), skbcpy);
@ -1335,13 +1334,11 @@ void RXvFreeRCB(struct vnt_rcb *rcb, int re_alloc_skb)
}
if (re_alloc_skb == true) {
rcb->skb = dev_alloc_skb((int)priv->rx_buf_sz);
rcb->skb = netdev_alloc_skb(priv->dev, priv->rx_buf_sz);
/* TODO error handling */
if (rcb->skb == NULL) {
if (!rcb->skb) {
DBG_PRT(MSG_LEVEL_ERR, KERN_ERR
" Failed to re-alloc rx skb\n");
} else {
rcb->skb->dev = priv->dev;
}
}

13
drivers/staging/vt6656/main_usb.c
View File

@ -855,12 +855,11 @@ static bool device_alloc_bufs(struct vnt_private *pDevice)
DBG_PRT(MSG_LEVEL_ERR,KERN_ERR" Failed to alloc rx urb\n");
goto free_rx_tx;
}
pRCB->skb = dev_alloc_skb((int)pDevice->rx_buf_sz);
pRCB->skb = netdev_alloc_skb(pDevice->dev, pDevice->rx_buf_sz);
if (pRCB->skb == NULL) {
DBG_PRT(MSG_LEVEL_ERR,KERN_ERR" Failed to alloc rx skb\n");
goto free_rx_tx;
}
pRCB->skb->dev = pDevice->dev;
pRCB->bBoolInUse = false;
EnqueueRCB(pDevice->FirstRecvFreeList, pDevice->LastRecvFreeList, pRCB);
pDevice->NumRecvFreeList++;
@ -931,13 +930,11 @@ static void device_free_frag_bufs(struct vnt_private *pDevice)
int device_alloc_frag_buf(struct vnt_private *pDevice,
PSDeFragControlBlock pDeF)
{
pDeF->skb = netdev_alloc_skb(pDevice->dev, pDevice->rx_buf_sz);
if (!pDeF->skb)
return false;
pDeF->skb = dev_alloc_skb((int)pDevice->rx_buf_sz);
if (pDeF->skb == NULL)
return false;
pDeF->skb->dev = pDevice->dev;
return true;
return true;
}
static int device_open(struct net_device *dev)