← Back to branch summary

~ubuntu-branches/ubuntu/trusty/linux-linaro-omap/trusty

« back to all changes in this revision

Viewing changes to drivers/staging/sbe-2t3e3/dc.c

  • Committer: Package Import Robot
  • Author(s): John Rigby, John Rigby
  • Date: 2011-09-26 10:44:23 UTC
  • Revision ID: package-import@ubuntu.com-20110926104423-57i0gl3v99b3lkfg
Tags: 3.0.0-1007.9
https://launchpad.net/bugs/826021
[ John Rigby ]

Enable crypto modules and remove crypto-modules from
exclude-module files
LP: #826021

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/staging/sbe-2t3e3/dc.c
341
341
                sc->ether.tx_ring = kzalloc(SBE_2T3E3_TX_DESC_RING_SIZE *
342
342
                                            sizeof(t3e3_tx_desc_t), GFP_KERNEL);
343
343
        if (sc->ether.tx_ring == NULL) {
344
 
#ifdef T3E3_USE_CONTIGMALLOC
345
 
                t3e3_contigmemory_size = SBE_2T3E3_RX_DESC_RING_SIZE *
346
 
                        sizeof(t3e3_rx_desc_t);
347
 
#endif
348
344
                kfree(sc->ether.rx_ring);
349
345
                sc->ether.rx_ring = NULL;
350
346
                dev_err(&sc->pdev->dev, "SBE 2T3E3: no buffer space for RX ring\n");
366
362
                                        dev_kfree_skb_any(sc->ether.rx_data[j]);
367
363
                                        sc->ether.rx_data[j] = NULL;
368
364
                                }
369
 
#ifdef T3E3_USE_CONTIGMALLOC
370
 
                                t3e3_contigmemory_size = SBE_2T3E3_RX_DESC_RING_SIZE *
371
 
                                        sizeof(t3e3_rx_desc_t);
372
 
#endif
373
365
                                kfree(sc->ether.rx_ring);
374
366
                                sc->ether.rx_ring = NULL;
375
 
#ifdef T3E3_USE_CONTIGMALLOC
376
 
                                t3e3_contigmemory_size = SBE_2T3E3_TX_DESC_RING_SIZE *
377
 
                                        sizeof(t3e3_tx_desc_t);
378
 
#endif
379
367
                                kfree(sc->ether.tx_ring);
380
368
                                sc->ether.tx_ring = NULL;
381
369
                                dev_err(&sc->pdev->dev, "SBE 2T3E3: token_alloc err:"
454
442
                }
455
443
        }
456
444
 
457
 
        if (sc->ether.rx_ring != NULL) {
458
 
#ifdef T3E3_USE_CONTIGMALLOC
459
 
                t3e3_contigmemory_size = SBE_2T3E3_RX_DESC_RING_SIZE *
460
 
                        sizeof(t3e3_rx_desc_t);
461
 
#endif
462
 
                kfree(sc->ether.rx_ring);
463
 
                sc->ether.rx_ring = NULL;
464
 
        }
465
 
 
466
 
        if (sc->ether.tx_ring != NULL) {
467
 
#ifdef T3E3_USE_CONTIGMALLOC
468
 
                t3e3_contigmemory_size = SBE_2T3E3_TX_DESC_RING_SIZE *
469
 
                        sizeof(t3e3_tx_desc_t);
470
 
#endif
471
 
                kfree(sc->ether.tx_ring);
472
 
                sc->ether.tx_ring = NULL;
473
 
        }
 
445
        kfree(sc->ether.rx_ring);
 
446
        sc->ether.rx_ring = NULL;
 
447
        kfree(sc->ether.tx_ring);
 
448
        sc->ether.tx_ring = NULL;
474
449
}
475
450
 
476
451