sync 8.09 with changes from trunk
[openwrt/svn-archive/archive.git] / package / libertas / patches / 100-compile_fix.patch
1 Index: kmod-libertas/ethtool.c
2 ===================================================================
3 --- kmod-libertas.orig/ethtool.c 2008-01-14 22:14:06.000000000 +0000
4 +++ kmod-libertas/ethtool.c 2008-01-14 22:14:14.000000000 +0000
5 @@ -144,16 +144,6 @@
6 lbs_deb_enter(LBS_DEB_ETHTOOL);
7 }
8
9 -static int lbs_ethtool_get_sset_count(struct net_device * dev, int sset)
10 -{
11 - switch (sset) {
12 - case ETH_SS_STATS:
13 - return MESH_STATS_NUM;
14 - default:
15 - return -EOPNOTSUPP;
16 - }
17 -}
18 -
19 static void lbs_ethtool_get_strings(struct net_device *dev,
20 u32 stringset,
21 u8 * s)
22 @@ -221,7 +211,6 @@
23 .get_drvinfo = lbs_ethtool_get_drvinfo,
24 .get_eeprom = lbs_ethtool_get_eeprom,
25 .get_eeprom_len = lbs_ethtool_get_eeprom_len,
26 - .get_sset_count = lbs_ethtool_get_sset_count,
27 .get_ethtool_stats = lbs_ethtool_get_stats,
28 .get_strings = lbs_ethtool_get_strings,
29 .get_wol = lbs_ethtool_get_wol,
30 Index: kmod-libertas/if_usb.c
31 ===================================================================
32 --- kmod-libertas.orig/if_usb.c 2008-01-14 22:14:57.000000000 +0000
33 +++ kmod-libertas/if_usb.c 2008-01-14 22:17:09.000000000 +0000
34 @@ -188,14 +188,14 @@
35 endpoint = &iface_desc->endpoint[i].desc;
36 if (usb_endpoint_is_bulk_in(endpoint)) {
37 cardp->ep_in_size = le16_to_cpu(endpoint->wMaxPacketSize);
38 - cardp->ep_in = usb_endpoint_num(endpoint);
39 + cardp->ep_in = endpoint->bEndpointAddress;
40
41 lbs_deb_usbd(&udev->dev, "in_endpoint = %d\n", cardp->ep_in);
42 lbs_deb_usbd(&udev->dev, "Bulk in size is %d\n", cardp->ep_in_size);
43
44 } else if (usb_endpoint_is_bulk_out(endpoint)) {
45 cardp->ep_out_size = le16_to_cpu(endpoint->wMaxPacketSize);
46 - cardp->ep_out = usb_endpoint_num(endpoint);
47 + cardp->ep_out = endpoint->bEndpointAddress;
48
49 lbs_deb_usbd(&udev->dev, "out_endpoint = %d\n", cardp->ep_out);
50 lbs_deb_usbd(&udev->dev, "Bulk out size is %d\n", cardp->ep_out_size);