evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: unisys: visornic: enable skb->len error-check, remove DEBUG blocks

Browse source 
* A skb->len error-check was enabled (removed from a "#ifdef DEBUG" block).
* Several unneeded "#ifdef DEBUG" blocks were removed.
* A dev_err() was converted to the more-appropriate netdev_err().

Signed-off-by: Tim Sell <Timothy.Sell@unisys.com>
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Tim Sell 2015-07-28 12:29:10 -04:00 • committed by Greg Kroah-Hartman
parent c847020e7a
commit cb84fca03d
1 changed files with 3 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
drivers/staging/unisys/visornic/visornic_main.c
View file

@ -1169,9 +1169,6 @@ visornic_rx(struct uiscmdrsp *cmdrsp)
int cc, currsize, off, status; int cc, currsize, off, status;
struct ethhdr *eth; struct ethhdr *eth;
unsigned long flags; unsigned long flags;
#ifdef DEBUG
struct phys_info testfrags[MAX_PHYS_INFO];
#endif
/* post new rcv buf to the other end using the cmdrsp we have at hand /* post new rcv buf to the other end using the cmdrsp we have at hand
* post it without holding lock - but we'll use the signal lock to * post it without holding lock - but we'll use the signal lock to
@ -1282,29 +1279,12 @@ visornic_rx(struct uiscmdrsp *cmdrsp)
curr->data_len = 0; curr->data_len = 0;
off += currsize; off += currsize;
} }
#ifdef DEBUG
/* assert skb->len == off */ /* assert skb->len == off */
if (skb->len != off) { if (skb->len != off) {
dev_err(&devdata->netdev->dev, netdev_err(devdata->netdev,
"%s something wrong; skb->len:%d != off:%d\n", "something wrong; skb->len:%d != off:%d\n",
netdev->name, skb->len, off); skb->len, off);
} }
/* test code */
cc = util_copy_fragsinfo_from_skb("rcvchaintest", skb,
RCVPOST_BUF_SIZE,
MAX_PHYS_INFO, testfrags);
if (cc != cmdrsp->net.rcv.numrcvbufs) {
dev_err(&devdata->netdev->dev,
"**** %s Something wrong; rcvd chain length %d different from one we calculated %d\n",
netdev->name, cmdrsp->net.rcv.numrcvbufs, cc);
}
for (i = 0; i < cc; i++) {
dev_inf(&devdata->netdev->dev,
"test:RCVPOST_BUF_SIZE:%d[%d] pfn:%llu off:0x%x len:%d\n",
RCVPOST_BUF_SIZE, i, testfrags[i].pi_pfn,
testfrags[i].pi_off, testfrags[i].pi_len);
}
#endif
} }
/* set up packet's protocl type using ethernet header - this /* set up packet's protocl type using ethernet header - this