← Back to branch summary

~ubuntu-branches/ubuntu/quantal/linux-linaro-mx51/quantal

« back to all changes in this revision

Viewing changes to drivers/net/ehea/ehea_main.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-3o58a3c1bj7x00rs
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/net/ehea/ehea_main.c
41
41
#include <linux/memory.h>
42
42
#include <asm/kexec.h>
43
43
#include <linux/mutex.h>
 
44
#include <linux/prefetch.h>
44
45
 
45
46
#include <net/ip.h>
46
47
 
2082
2083
        struct netdev_hw_addr *ha;
2083
2084
        int ret;
2084
2085
 
2085
 
        if (dev->flags & IFF_PROMISC) {
 
2086
        if (port->promisc) {
2086
2087
                ehea_promiscuous(dev, 1);
2087
2088
                return;
2088
2089
        }
3262
3263
        dev->netdev_ops = &ehea_netdev_ops;
3263
3264
        ehea_set_ethtool_ops(dev);
3264
3265
 
 
3266
        dev->hw_features = NETIF_F_SG | NETIF_F_FRAGLIST | NETIF_F_TSO
 
3267
                      | NETIF_F_IP_CSUM | NETIF_F_HW_VLAN_TX | NETIF_F_LRO;
3265
3268
        dev->features = NETIF_F_SG | NETIF_F_FRAGLIST | NETIF_F_TSO
3266
3269
                      | NETIF_F_HIGHDMA | NETIF_F_IP_CSUM | NETIF_F_HW_VLAN_TX
3267
3270
                      | NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_FILTER
3268
 
                      | NETIF_F_LLTX;
 
3271
                      | NETIF_F_LLTX | NETIF_F_RXCSUM;
3269
3272
        dev->watchdog_timeo = EHEA_WATCH_DOG_TIMEOUT;
3270
3273
 
3271
3274
        if (use_lro)