~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to drivers/net/hydra.c

  • Committer: Bazaar Package Importer
  • Author(s): Paolo Pisati
  • Date: 2011-06-29 15:23:51 UTC
  • mfrom: (26.1.1 natty-proposed)
  • Revision ID: james.westby@ubuntu.com-20110629152351-xs96tm303d95rpbk
Tags: 3.0.0-1200.2
* Rebased against 3.0.0-6.7
* BSP from TI based on 3.0.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
98
98
        .ndo_open               = hydra_open,
99
99
        .ndo_stop               = hydra_close,
100
100
 
101
 
        .ndo_start_xmit         = ei_start_xmit,
102
 
        .ndo_tx_timeout         = ei_tx_timeout,
103
 
        .ndo_get_stats          = ei_get_stats,
104
 
        .ndo_set_multicast_list = ei_set_multicast_list,
 
101
        .ndo_start_xmit         = __ei_start_xmit,
 
102
        .ndo_tx_timeout         = __ei_tx_timeout,
 
103
        .ndo_get_stats          = __ei_get_stats,
 
104
        .ndo_set_multicast_list = __ei_set_multicast_list,
105
105
        .ndo_validate_addr      = eth_validate_addr,
106
 
        .ndo_set_mac_address    = eth_mac_addr,
 
106
        .ndo_set_mac_address    = eth_mac_addr,
107
107
        .ndo_change_mtu         = eth_change_mtu,
108
108
#ifdef CONFIG_NET_POLL_CONTROLLER
109
 
        .ndo_poll_controller    = ei_poll,
 
109
        .ndo_poll_controller    = __ei_poll,
110
110
#endif
111
111
};
112
112
 
125
125
        0x10, 0x12, 0x14, 0x16, 0x18, 0x1a, 0x1c, 0x1e,
126
126
    };
127
127
 
128
 
    dev = alloc_ei_netdev();
 
128
    dev = ____alloc_ei_netdev(0);
129
129
    if (!dev)
130
130
        return -ENOMEM;
131
131