Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 3e2ab46df697048e222cdc046a2fa97149ca32ba

Authored by Linus Torvalds
2 parents e6e5fee142 54caf44da3
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
  [netdrvr] mv643xx_eth: fix obvious typo, which caused build breakage
  [netdrvr] lp486e: fix typo

Showing 2 changed files Side-by-side Diff

drivers/net/lp486e.c
Diff comments   View file @ 3e2ab46
... ... @@ -442,16 +442,16 @@
442 442 if (rbd) {
443 443 rbd->pad = 0;
444 444 rbd->count = 0;
445   - rbd->skb = dev_alloc_skb(RX_SKB_SIZE);
  445 + rbd->skb = dev_alloc_skb(RX_SKBSIZE);
446 446 if (!rbd->skb) {
447 447 printk("dev_alloc_skb failed");
448 448 }
449 449 rbd->next = rfd->rbd;
450 450 if (i) {
451 451 rfd->rbd->prev = rbd;
452   - rbd->size = RX_SKB_SIZE;
  452 + rbd->size = RX_SKBSIZE;
453 453 } else {
454   - rbd->size = (RX_SKB_SIZE | RBD_EL);
  454 + rbd->size = (RX_SKBSIZE | RBD_EL);
455 455 lp->rbd_tail = rbd;
456 456 }
457 457  
drivers/net/mv643xx_eth.c
Diff comments   View file @ 3e2ab46
... ... @@ -385,7 +385,7 @@
385 385 struct pkt_info pkt_info;
386 386  
387 387 while (budget-- > 0 && eth_port_receive(mp, &pkt_info) == ETH_OK) {
388   - dma_unmap_single(NULL, pkt_info.buf_ptr, RX_SKB_SIZE,
  388 + dma_unmap_single(NULL, pkt_info.buf_ptr, ETH_RX_SKB_SIZE,
389 389 DMA_FROM_DEVICE);
390 390 mp->rx_desc_count--;
391 391 received_packets++;