Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 143635
b: refs/heads/master
c: 79bd109
h: refs/heads/master
i:
  143633: 352ece4
  143631: e041caf
v: v3
  • Loading branch information
Alexander Beregalov authored and Greg Kroah-Hartman committed Apr 17, 2009
1 parent d2ec8bb commit 0600ce6
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 8 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d39efb24eaf7cbda4d161b152f1eab82939fb6e9
refs/heads/master: 79bd1096bb31445a04b43e470e03d40d700a14a1
21 changes: 14 additions & 7 deletions trunk/drivers/staging/slicoss/slicoss.c
Original file line number Diff line number Diff line change
Expand Up @@ -345,6 +345,19 @@ static void slic_init_adapter(struct net_device *netdev,
return;
}

static const struct net_device_ops slic_netdev_ops = {
.ndo_open = slic_entry_open,
.ndo_stop = slic_entry_halt,
.ndo_start_xmit = slic_xmit_start,
.ndo_do_ioctl = slic_ioctl,
.ndo_set_mac_address = slic_mac_set_address,
.ndo_get_stats = slic_get_stats,
.ndo_set_multicast_list = slic_mcast_set_list,
.ndo_validate_addr = eth_validate_addr,
.ndo_set_mac_address = eth_mac_addr,
.ndo_change_mtu = eth_change_mtu,
};

static int __devinit slic_entry_probe(struct pci_dev *pcidev,
const struct pci_device_id *pci_tbl_entry)
{
Expand Down Expand Up @@ -442,13 +455,7 @@ static int __devinit slic_entry_probe(struct pci_dev *pcidev,

netdev->base_addr = (unsigned long)adapter->memorybase;
netdev->irq = adapter->irq;
netdev->open = slic_entry_open;
netdev->stop = slic_entry_halt;
netdev->hard_start_xmit = slic_xmit_start;
netdev->do_ioctl = slic_ioctl;
netdev->set_mac_address = slic_mac_set_address;
netdev->get_stats = slic_get_stats;
netdev->set_multicast_list = slic_mcast_set_list;
netdev->netdev_ops = &slic_netdev_ops;

slic_debug_adapter_create(adapter);

Expand Down

0 comments on commit 0600ce6

Please sign in to comment.