Update of /cvsroot/gc-linux/linux/drivers/net
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv751/drivers/net
Modified Files:
Kconfig Makefile gcn-bba.c
Log Message:
Merge gc-linux-v2.6.31.
Index: gcn-bba.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/net/gcn-bba.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** gcn-bba.c 25 Oct 2009 18:50:27 -0000 1.19
--- gcn-bba.c 25 Oct 2009 18:59:28 -0000 1.20
***************
*** 350,357 ****
packet_len:12,
next_packet_ptr:12;
! #else
__u32 next_packet_ptr:12,
packet_len:12,
status:8;
#endif
} __attribute((packed));
--- 350,359 ----
packet_len:12,
next_packet_ptr:12;
! #elif defined(__LITTLE_ENDIAN_BITFIELD)
__u32 next_packet_ptr:12,
packet_len:12,
status:8;
+ #else
+ #error "Unsupported byte order."
#endif
} __attribute((packed));
***************
*** 717,721 ****
/* move read pointer to next packet */
! bba_out12(BBA_RRP, rrp = descr.next_packet_ptr);
/* get write pointer and continue */
--- 719,724 ----
/* move read pointer to next packet */
! rrp = descr.next_packet_ptr;
! bba_out12(BBA_RRP, rrp);
/* get write pointer and continue */
***************
*** 1089,1092 ****
--- 1092,1105 ----
}
+ static const struct net_device_ops bba_netdev_ops = {
+ .ndo_open = bba_open,
+ .ndo_stop = bba_close,
+ .ndo_start_xmit = bba_start_xmit,
+ .ndo_get_stats = bba_get_stats,
+ .ndo_change_mtu = eth_change_mtu,
+ .ndo_validate_addr = eth_validate_addr,
+ .ndo_set_mac_address = eth_mac_addr,
+ };
+
/*
* Initializes a BroadBand Adapter device.
***************
*** 1111,1118 ****
/* network device hooks */
! dev->open = bba_open;
! dev->stop = bba_close;
! dev->hard_start_xmit = bba_start_xmit;
! dev->get_stats = bba_get_stats;
priv = netdev_priv(dev);
--- 1124,1128 ----
/* network device hooks */
! dev->netdev_ops = &bba_netdev_ops;
priv = netdev_priv(dev);
Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/net/Makefile,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** Makefile 25 Oct 2009 18:56:56 -0000 1.37
--- Makefile 25 Oct 2009 18:59:28 -0000 1.38
***************
*** 242,245 ****
--- 242,246 ----
obj-$(CONFIG_ENC28J60) += enc28j60.o
obj-$(CONFIG_ETHOC) += ethoc.o
+ obj-$(CONFIG_GAMECUBE_BBA) += gcn-bba.o
obj-$(CONFIG_XTENSA_XT2000_SONIC) += xtsonic.o
Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/net/Kconfig,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** Kconfig 25 Oct 2009 18:56:56 -0000 1.43
--- Kconfig 25 Oct 2009 18:59:28 -0000 1.44
***************
*** 271,274 ****
--- 271,283 ----
will be called bmac.
+ config GAMECUBE_BBA
+ tristate "Nintendo GameCube ethernet BroadBand Adapter (BBA)"
+ depends on GAMECUBE_EXI && GAMECUBE
+ help
+ Say Y here to add ethernet support for the Broadband Adapter (BBA).
+
+ To compile this driver as a module, choose M here: the module
+ will be called gcn-bba.
+
config ARIADNE
tristate "Ariadne support"
|
