wimax/i2400m: add the ability to fallback to other firmware files if the default is not there
Subsystems (2)
PATCH 1/1 wimax/i2400m: add the ability to fallback to other firmware files if the default is not there
In order to support backwards compatibility with older firmwares when a driver is updated by a new kernel release, the i2400m bus drivers can declare a list of firmware files they can work with (in general these will be each a different version). The firmware loader will try them in sequence until one loads.
Thus, if a user doesn't have the latest and greatest firmware that a newly installed kernel would require, the driver would fall back to the firmware from a previous release.
To support this, the i2400m->bus_fw_name is changed to be a NULL terminated array firmware file names (and renamed to bus_fw_names) and we add a new entry (i2400m->fw_name) that points to the name of the firmware being currently used. All code that needs to print the firmware file name uses i2400m->fw_name instead of the old i2400m->bus_fw_name.
The code in i2400m_dev_bootstrap() that loads the firmware is changed with an iterator over the firmware file name list that tries to load each form user space, using the first one that succeeds in request_firmware() (and thus stopping the iteration).
The USB and SDIO bus drivers are updated to take advantage of this and reflect which firmwares they support.
--- drivers/net/wimax/i2400m/fw.c | 53 +++++++++++++++++++++++-------------- drivers/net/wimax/i2400m/i2400m.h | 21 ++++++++------ drivers/net/wimax/i2400m/sdio.c | 11 +++++-- drivers/net/wimax/i2400m/usb.c | 14 +++++++-- 4 files changed, 64 insertions(+), 35 deletions(-)
drivers/net/wimax/i2400m/fw.c +33 -20
@@ -483,7 +483,7 @@ ssize_t i2400m_dnload_bcf(struct i2400m *i2400m,if (offset + section_size > bcf_len) {dev_err (dev,"fw %s: bad section #%zu, " "end (@%zu) beyond EOF (@%zu)\n" , - i2400m->bus_fw_name, section, + i2400m->fw_name, section, offset + section_size, bcf_len); ret = -EINVAL ; goto error_section_beyond_eof;
@@ -493,7 +493,7 @@ ssize_t i2400m_dnload_bcf(struct i2400m *i2400m, &ack, sizeof(ack), I2400M_BM_CMD_RAW);if (ret <0 ) {dev_err (dev,"fw %s: section #%zu (@%zu %zu B) " -"failed %d\n" , i2400m->bus_fw_name, section, +"failed %d\n" , i2400m->fw_name, section, offset,sizeof (*bh) + data_size, (int ) ret); goto error_send; }
@@ -874,7 +874,7 @@ int i2400m_dnload_init(struct i2400m *i2400m, const struct i2400m_bcf_hdr *bcf)if (result <0 )dev_err (dev,"fw %s: non-signed download " "initialization failed: %d\n" , - i2400m->bus_fw_name, result); + i2400m->fw_name, result); }else if (i2400m->sboot ==0 && (module_id &I2400M_BCF_MOD_ID_POKES )) {/* non-signed boot process with pokes, nothing to do */
@@ -886,7 +886,7 @@ int i2400m_dnload_init(struct i2400m *i2400m, const struct i2400m_bcf_hdr *bcf)if (result <0 )dev_err (dev,"fw %s: signed boot download " "initialization failed: %d\n" , - i2400m->bus_fw_name, result); + i2400m->fw_name, result); }return result; }
@@ -915,7 +915,7 @@ int i2400m_fw_check(struct i2400m *i2400m,if (bcf_size <sizeof (*bcf)) {/* big enough header? */ dev_err (dev,"firmware %s too short: " "%zu B vs %zu (at least) expected\n" , - i2400m->bus_fw_name, bcf_size,sizeof (*bcf)); + i2400m->fw_name, bcf_size,sizeof (*bcf)); goto error; }
@@ -931,7 +931,7 @@ int i2400m_fw_check(struct i2400m *i2400m,if (bcf_size != size) {/* annoyingly paranoid */ dev_err (dev,"firmware %s: bad size, got " "%zu B vs %u expected\n" , - i2400m->bus_fw_name, bcf_size, size); + i2400m->fw_name, bcf_size, size); goto error; }
@@ -943,7 +943,7 @@ int i2400m_fw_check(struct i2400m *i2400m,if (module_type !=6 ) {/* built for the right hardware? */ dev_err (dev,"bad fw %s: unexpected module type 0x%x; " -"aborting\n" , i2400m->bus_fw_name, module_type); +"aborting\n" , i2400m->fw_name, module_type); goto error; }
@@ -951,10 +951,10 @@ int i2400m_fw_check(struct i2400m *i2400m, result =0 ;if (module_vendor !=0x8086 )dev_err (dev,"bad fw %s? unexpected vendor 0x%04x\n" , - i2400m->bus_fw_name, module_vendor); + i2400m->fw_name, module_vendor);if (date <0x20080300 )dev_err (dev,"bad fw %s? build date too old %08x\n" , - i2400m->bus_fw_name, date); + i2400m->fw_name, date); error:return result; }
@@ -1016,7 +1016,7 @@ hw_reboot: goto error_dev_rebooted;if (ret <0 ) {dev_err (dev,"fw %s: download failed: %d\n" , - i2400m->bus_fw_name, ret); + i2400m->fw_name, ret); goto error_dnload_bcf; }
@@ -1026,12 +1026,12 @@ hw_reboot:if (ret <0 ) {dev_err (dev,"fw %s: " "download finalization failed: %d\n" , - i2400m->bus_fw_name, ret); + i2400m->fw_name, ret); goto error_dnload_finalize; }d_printf (2 , dev,"fw %s successfully uploaded\n" , - i2400m->bus_fw_name); + i2400m->fw_name); i2400m->boot_mode =0 ; error_dnload_finalize: error_dnload_bcf:
@@ -1067,28 +1067,41 @@ error_dev_rebooted:*/ int i2400m_dev_bootstrap (struct i2400m *i2400m,enum i2400m_bri flags) { -int ret =0 ; +int ret =0 , itr =0 ;struct device *dev =i2400m_dev (i2400m);const struct firmware *fw;const struct i2400m_bcf_hdr *bcf;/* Firmware data */ +const char *fw_name;d_fnstart (5 , dev,"(i2400m %p)\n" , i2400m); +/* Load firmware files to memory. */ - ret =request_firmware (&fw, i2400m->bus_fw_name, dev); -if (ret) { -dev_err (dev,"fw %s: request failed: %d\n" , - i2400m->bus_fw_name, ret); - goto error_fw_req; + itr =0 ; +while (1 ) { + fw_name = i2400m->bus_fw_names[itr]; +if (fw_name ==NULL ) { +dev_err (dev,"Could not find a usable firmware image\n" ); + ret = -ENOENT ; + goto error_no_fw; + } + ret =request_firmware (&fw, fw_name, dev); +if (ret ==0 ) +break ;/* got it */ +if (ret <0 ) +dev_err (dev,"fw %s: cannot load file: %d\n" , + fw_name, ret); + itr++; } - bcf = (void *) fw->data; + bcf = (void *) fw->data; + i2400m->fw_name = fw_name; ret =i2400m_fw_check (i2400m, bcf, fw->size);if (ret <0 ) goto error_fw_bad; ret =i2400m_fw_dnload (i2400m, bcf, fw->size, flags); error_fw_bad:release_firmware (fw); -error_fw_req: +error_no_fw:d_fnend (5 , dev,"(i2400m %p) = %d\n" , i2400m, ret);return ret; }
drivers/net/wimax/i2400m/i2400m.h +12 -9
@@ -156,10 +156,6 @@ enum { }; -/* Firmware version we request when pulling the fw image file */ -#define I2400M_FW_VERSION "1.4" - -/** * i2400m_reset_type - methods to reset a device *
@@ -242,10 +238,14 @@ struct i2400m_reset_ctx;* The caller to this function will check if the response is a * barker that indicates the device going into reset mode. * -* @bus_fw_name: [fill] name of the firmware image (in most cases, -* they are all the same for a single release, except that they -* have the type of the bus embedded in the name (eg: -* i2400m-fw-X-VERSION.sbcf, where X is the bus name). +* @bus_fw_names: [fill] a NULL-terminated array with the names of the +* firmware images to try loading. This is made a list so we can +* support backward compatibility of firmware releases (eg: if we +* can't find the default v1.4, we try v1.3). In general, the name +* should be i2400m-fw-X-VERSION.sbcf, where X is the bus name. +* The list is tried in order and the first one that loads is +* used. The fw loader will set i2400m->fw_name to point to the +* active firmware image. * * @bus_bm_mac_addr_impaired: [fill] Set to true if the device's MAC * address provided in boot mode is kind of broken and needs to
@@ -364,6 +364,8 @@ struct i2400m_reset_ctx;* These have to be in a separate directory, a child of * (wimax_dev->debugfs_dentry) so they can be removed when the * module unloads, as we don't keep each dentry. +* +* @fw_name: name of the firmware image that is currently being used. */ struct i2400m {struct wimax_dev wimax_dev;/* FIRST! See doc */
@@ -388,7 +390,7 @@ struct i2400m { size_t, int flags);ssize_t (*bus_bm_wait_for_ack)(struct i2400m *,struct i2400m_bootrom_header *,size_t ); -const char *bus_fw_name; +const char **bus_fw_names; unsigned bus_bm_mac_addr_impaired:1;spinlock_t tx_lock;/* protect TX state */
@@ -421,6 +423,7 @@ struct i2400m {struct sk_buff *wake_tx_skb;struct dentry *debugfs_dentry; +const char *fw_name;/* name of the current firmware image */ };
drivers/net/wimax/i2400m/sdio.c +8 -3
@@ -70,8 +70,13 @@static int ioe_timeout =2 ;module_param (ioe_timeout, int,0 ); -/* Our firmware file name */ -#define I2400MS_FW_FILE_NAME "i2400m-fw-sdio-" I2400M_FW_VERSION ".sbcf" +/* Our firmware file name list */ +static const char *i2400ms_bus_fw_names[] = { +#define I2400MS_FW_FILE_NAME "i2400m-fw-sdio-1.3.sbcf" +I2400MS_FW_FILE_NAME , +NULL +}; +/* * Enable the SDIO function
@@ -401,7 +406,7 @@ int i2400ms_probe(struct sdio_func *func, i2400m->bus_reset = i2400ms_bus_reset; i2400m->bus_bm_cmd_send = i2400ms_bus_bm_cmd_send; i2400m->bus_bm_wait_for_ack = i2400ms_bus_bm_wait_for_ack; - i2400m->bus_fw_name =I2400MS_FW_FILE_NAME ; + i2400m->bus_fw_names = i2400ms_bus_fw_names; i2400m->bus_bm_mac_addr_impaired =1 ; result =i2400ms_enable_function (i2400ms->func);
drivers/net/wimax/i2400m/usb.c +11 -3
@@ -73,7 +73,14 @@/* Our firmware file name */ -#define I2400MU_FW_FILE_NAME "i2400m-fw-usb-" I2400M_FW_VERSION ".sbcf" +static const char *i2400mu_bus_fw_names[] = { +#define I2400MU_FW_FILE_NAME_v1_4 "i2400m-fw-usb-1.4.sbcf" + I2400MU_FW_FILE_NAME_v1_4, +#define I2400MU_FW_FILE_NAME_v1_3 "i2400m-fw-usb-1.3.sbcf" + I2400MU_FW_FILE_NAME_v1_3, +NULL , +}; +static int i2400mu_bus_dev_start (struct i2400m *i2400m)
@@ -394,7 +401,7 @@ int i2400mu_probe(struct usb_interface *iface, i2400m->bus_reset = i2400mu_bus_reset; i2400m->bus_bm_cmd_send = i2400mu_bus_bm_cmd_send; i2400m->bus_bm_wait_for_ack = i2400mu_bus_bm_wait_for_ack; - i2400m->bus_fw_name =I2400MU_FW_FILE_NAME ; + i2400m->bus_fw_names = i2400mu_bus_fw_names; i2400m->bus_bm_mac_addr_impaired =0 ;#ifdef CONFIG_PM
@@ -594,4 +601,5 @@ module_exit(i2400mu_driver_exit);MODULE_AUTHOR ("Intel Corporation <[email protected]>" );MODULE_DESCRIPTION ("Intel 2400M WiMAX networking for USB" );MODULE_LICENSE ("GPL" ); -MODULE_FIRMWARE (I2400MU_FW_FILE_NAME ); +MODULE_FIRMWARE (I2400MU_FW_FILE_NAME_v1_4); +MODULE_FIRMWARE (I2400MU_FW_FILE_NAME_v1_3);
Signature · 1 line
1.5.6.5
PATCH 1/1 wimax/i2400m: firmware_check() encodes the firmware version in i2400m->fw_version
In reply to Inaky Perez-GonzalezUpcoming modifications will need to test for the running firmware version before activating a feature or not. This is helpful to implement backward compatibility with older firmware versions.
Modify i2400m_firmware_check() to encode in i2400m->fw_version the major and minor version numbers of the firmware interface.
As well, move the call to be done as the very first operation once we have communication with the device during probe() [in __i2400m_dev_start()]. This is needed so any operation that is executed afterwards can determine which fw version it is talking to.
--- drivers/net/wimax/i2400m/control.c | 12 +++++++----- drivers/net/wimax/i2400m/driver.c | 5 +++++ drivers/net/wimax/i2400m/i2400m.h | 4 ++++ 3 files changed, 16 insertions(+), 5 deletions(-)
drivers/net/wimax/i2400m/control.c +7 -5
@@ -52,7 +52,6 @@* * i2400m_dev_initalize() Called by i2400m_dev_start() * i2400m_set_init_config() -* i2400m_firmware_check() * i2400m_cmd_get_state() * i2400m_dev_shutdown() Called by i2400m_dev_stop() * i2400m->bus_reset()
@@ -959,6 +958,10 @@ enum {* Long function, but quite simple; first chunk launches the command * and double checks the reply for the right TLV. Then we process the * TLV (where the meat is). +* +* Once we process the TLV that gives us the firmware's interface +* version, we encode it and save it in i2400m->fw_version for future +* reference. */ int i2400m_firmware_check (struct i2400m *i2400m) {
@@ -1018,9 +1021,11 @@ int i2400m_firmware_check(struct i2400m *i2400m)if (minor < I2400M_HDIv_MINOR_2 && minor > I2400M_HDIv_MINOR)dev_warn (dev,"untested minor fw version %u.%u.%u\n" , major, minor, branch); -error_bad_major: +/* Yes, we ignore the branch -- we don't have to track it */ + i2400m->fw_version = major <<16 | minor;dev_info (dev,"firmware interface version %u.%u.%u\n" , major, minor, branch); +error_bad_major: error_no_tlv: error_cmd_failed:kfree_skb (ack_skb);
@@ -1251,9 +1256,6 @@ int i2400m_dev_initialize(struct i2400m *i2400m) result =i2400m_set_init_config (i2400m, args, argc);if (result <0 ) goto error; - result =i2400m_firmware_check (i2400m);/* fw versions ok? */ -if (result <0 ) - goto error;/* * Update state: Here it just calls a get state; parsing the * result (System State TLV and RF Status TLV [done in the rx
drivers/net/wimax/i2400m/driver.c +5 -0
@@ -48,6 +48,7 @@* i2400m_dev_bootstrap() * i2400m_tx_setup() * i2400m->bus_dev_start() +* i2400m_firmware_check() * i2400m_check_mac_addr() * wimax_dev_add() *
@@ -404,6 +405,9 @@ retry:dev_err (dev,"cannot create workqueue\n" ); goto error_create_workqueue; } + result =i2400m_firmware_check (i2400m);/* fw versions ok? */ +if (result <0 ) + goto error_fw_check;/* At this point is ok to send commands to the device */ result =i2400m_check_mac_addr (i2400m);if (result <0 )
@@ -421,6 +425,7 @@ retry: error_dev_initialize: error_check_mac_addr: +error_fw_check:destroy_workqueue (i2400m->work_queue); error_create_workqueue: i2400m->bus_dev_stop (i2400m);
drivers/net/wimax/i2400m/i2400m.h +4 -0
@@ -366,6 +366,9 @@ struct i2400m_reset_ctx;* module unloads, as we don't keep each dentry. * * @fw_name: name of the firmware image that is currently being used. +* +* @fw_version: version of the firmware interface, Major.minor, +* encoded in the high word and low word (major << 16 | minor). */ struct i2400m {struct wimax_dev wimax_dev;/* FIRST! See doc */
@@ -424,6 +427,7 @@ struct i2400m {struct dentry *debugfs_dentry;const char *fw_name;/* name of the current firmware image */ +unsigned long fw_version;/* version of the firmware interface */ };
Signature · 1 line
1.5.6.5
PATCH 1/1 wimax/i2400m: allow control of the base-station idle mode timeout
For power saving reasons, WiMAX links can be put in idle mode while connected after a certain time of the link not being used for tx or rx. In this mode, the device pages the base-station regularly and when data is ready to be transmitted, the link is revived.
This patch allows the user to control the time the device has to be idle before it decides to go to idle mode from a sysfs interace.
It also updates the initialization code to acknowledge the module variable 'idle_mode_disabled' when the firmware is a newer version (upcoming 1.4 vs 2.6.29's v1.3).
The method for setting the idle mode timeout in the older firmwares is much more limited and can be only done at initialization time. Thus, the sysfs file will return -ENOSYS on older ones.
--- drivers/net/wimax/i2400m/Makefile | 1 + drivers/net/wimax/i2400m/control.c | 98 ++++++++++++++++++++++++++++--- drivers/net/wimax/i2400m/debug-levels.h | 1 + drivers/net/wimax/i2400m/driver.c | 10 +++ drivers/net/wimax/i2400m/i2400m.h | 29 +++++++++ drivers/net/wimax/i2400m/sysfs.c | 80 +++++++++++++++++++++++++ include/linux/wimax/i2400m.h | 10 +++ 7 files changed, 221 insertions(+), 8 deletions(-) create mode 100644 drivers/net/wimax/i2400m/sysfs.c
drivers/net/wimax/i2400m/Makefile +1 -0
@@ -8,6 +8,7 @@ i2400m-y := \ driver.o \ fw.o \ op-rfkill.o \ + sysfs.o \ netdev.o \ tx.o \ rx.o
drivers/net/wimax/i2400m/control.c +90 -8
121 lines not on this page · raw message
drivers/net/wimax/i2400m/debug-levels.h +1 -0
@@ -38,6 +38,7 @@ enum d_module {D_SUBMODULE_DECLARE (netdev),D_SUBMODULE_DECLARE (rfkill),D_SUBMODULE_DECLARE (rx), +D_SUBMODULE_DECLARE (sysfs), D_SUBMODULE_DECLARE(tx), };
drivers/net/wimax/i2400m/driver.c +10 -0
@@ -662,6 +662,11 @@ int i2400m_setup(struct i2400m *i2400m, enum i2400m_bri bm_flags)wimax_state_change (wimax_dev,WIMAX_ST_UNINITIALIZED );/* Now setup all that requires a registered net and wimax device. */ + result =sysfs_create_group (&net_dev->dev.kobj, &i2400m_dev_attr_group); +if (result <0 ) { +dev_err (dev,"cannot setup i2400m's sysfs: %d\n" , result); + goto error_sysfs_setup; + } result =i2400m_debugfs_add (i2400m);if (result <0 ) {dev_err (dev,"cannot setup i2400m's debugfs: %d\n" , result);
@@ -671,6 +676,9 @@ int i2400m_setup(struct i2400m *i2400m, enum i2400m_bri bm_flags)return result; error_debugfs_setup: +sysfs_remove_group (&i2400m->wimax_dev.net_dev->dev.kobj, + &i2400m_dev_attr_group); +error_sysfs_setup:wimax_dev_rm (&i2400m->wimax_dev); error_wimax_dev_add:i2400m_dev_stop (i2400m);
@@ -702,6 +710,8 @@ void i2400m_release(struct i2400m *i2400m)netif_stop_queue (i2400m->wimax_dev.net_dev);i2400m_debugfs_rm (i2400m); +sysfs_remove_group (&i2400m->wimax_dev.net_dev->dev.kobj, + &i2400m_dev_attr_group);wimax_dev_rm (&i2400m->wimax_dev);i2400m_dev_stop (i2400m);unregister_netdev (i2400m->wimax_dev.net_dev);
drivers/net/wimax/i2400m/i2400m.h +29 -0
@@ -585,6 +585,8 @@ unsigned i2400m_brh_get_signature(const struct i2400m_bootrom_header *hdr)* Driver / device setup and internal functions */ extern void i2400m_netdev_setup (struct net_device *net_dev); +extern int i2400m_sysfs_setup (struct device_driver *); +extern void i2400m_sysfs_release (struct device_driver *);extern int i2400m_tx_setup (struct i2400m *);extern void i2400m_wake_tx_work (struct work_struct *);extern void i2400m_tx_release (struct i2400m *);
@@ -728,6 +730,7 @@ extern struct sk_buff *i2400m_get_device_info(struct i2400m *);extern int i2400m_firmware_check (struct i2400m *);extern int i2400m_set_init_config (struct i2400m *,const struct i2400m_tlv_hdr **,size_t ); +extern int i2400m_set_idle_timeout (struct i2400m *,unsigned );static inline struct usb_endpoint_descriptor *usb_get_epd (struct usb_interface *iface,int ep)
@@ -740,6 +743,32 @@ extern int i2400m_op_rfkill_sw_toggle(struct wimax_dev *,extern void i2400m_report_tlv_rf_switches_status (struct i2400m *,const struct i2400m_tlv_rf_switches_status *); +/* +* Helpers for firmware backwards compability +* +* As we aim to support at least the firmware version that was +* released with the previous kernel/driver release, some code will be +* conditionally executed depending on the firmware version. On each +* release, the code to support fw releases past the last two ones +* will be purged. +* +* By making it depend on this macros, it is easier to keep it a tab +* on what has to go and what not. +*/ +static inline +unsigned i2400m_le_v1_3 (struct i2400m *i2400m) +{ +/* running fw is lower or v1.3 */ +return i2400m->fw_version <=0x00090001 ; +} + +static inline +unsigned i2400m_ge_v1_4 (struct i2400m *i2400m) +{ +/* running fw is higher or v1.4 */ +return i2400m->fw_version >=0x00090002 ; +} +/* * Do a millisecond-sleep for allowing wireshark to dump all the data
drivers/net/wimax/i2400m/sysfs.c new file +80 -0
80 lines not on this page · raw message
include/linux/wimax/i2400m.h +10 -0
@@ -381,6 +381,7 @@ enum i2400m_tlv {I2400M_TLV_RF_STATUS =163 ,I2400M_TLV_DEVICE_RESET_TYPE =132 ,I2400M_TLV_CONFIG_IDLE_PARAMETERS =601 , + I2400M_TLV_CONFIG_IDLE_TIMEOUT = 611, };
@@ -509,4 +510,13 @@ struct i2400m_tlv_media_status {__le32 media_status; } __attribute__((packed)); + +/* New in v1.4 */ +struct i2400m_tlv_config_idle_timeout { +struct i2400m_tlv_hdr hdr; +__le32 timeout;/* 100 to 300000 ms [5min], 100 increments +* 0 disabled */ +} __attribute__((packed)); + +#endif /* #ifndef __LINUX__WIMAX__I2400M_H__ */
Signature · 1 line
1.5.6.5
PATCH 1/1 wimax: struct device - replace bus_id with dev_name(), dev_set_name()
From: Kay Sievers <[email protected]>
--- drivers/net/wimax/i2400m/driver.c | 2 +- drivers/net/wimax/i2400m/usb-notif.c | 2 +- include/linux/wimax/debug.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
drivers/net/wimax/i2400m/driver.c +1 -1
@@ -618,7 +618,7 @@ int i2400m_setup(struct i2400m *i2400m, enum i2400m_bri bm_flags)d_fnstart (3 , dev,"(i2400m %p)\n" , i2400m);snprintf (wimax_dev->name,sizeof (wimax_dev->name), -"i2400m-%s:%s" , dev->bus->name, dev->bus_id); +"i2400m-%s:%s" , dev->bus->name,dev_name (dev)); i2400m->bm_cmd_buf =kzalloc (I2400M_BM_CMD_BUF_SIZE ,GFP_KERNEL );if (i2400m->bm_cmd_buf ==NULL ) {
drivers/net/wimax/i2400m/usb-notif.c +1 -1
@@ -102,7 +102,7 @@ int i2400mu_notification_grok(struct i2400mu *i2400mu, const void *buf,dev_err (dev,"HW BUG? Unknown/unexpected data in notification " "message (%zu bytes)\n" , buf_len);snprintf (prefix,sizeof (prefix),"%s %s: " , -dev_driver_string (dev) , dev->bus_id); +dev_driver_string (dev),dev_name (dev));if (buf_len >64 ) {print_hex_dump (KERN_ERR , prefix,DUMP_PREFIX_OFFSET ,8 ,4 , buf,64 ,0 );
include/linux/wimax/debug.h +1 -1
@@ -178,7 +178,7 @@ void __d_head(char *head, size_t head_size,WARN_ON (1 ); }else snprintf (head, head_size,"%s %s: " , -dev_driver_string (dev), dev->bus_id); +dev_driver_string (dev),dev_name (dev)); }
Signature · 1 line
1.5.6.5
PATCH 1/1 wimax/i2400m: drop support for deprecated major fw interface, add for new minor
In reply to Inaky Perez-GonzalezFirmware interface version 8.x.x has long been deprecated and is no longer supported (nor available, as it is a preproduction firmware), so it can be safely dropped.
Add support for firmware interface v9.2.x (current is 9.1.x). Firmware version 9.2.x is backwards compatible with 9.1.x; new features are enabled if switches are pressed to turn them on. Forthcoming commits to the driver will start pressing those switches when the firmware interface supports it.
--- drivers/net/wimax/i2400m/control.c | 14 +++++--------- 1 files changed, 5 insertions(+), 9 deletions(-)
drivers/net/wimax/i2400m/control.c +5 -9
@@ -942,8 +942,8 @@ error_cmd_failed:/* Firmware interface versions we support */ enum { I2400M_HDIv_MAJOR =9 , - I2400M_HDIv_MAJOR_2 =8 , I2400M_HDIv_MINOR =1 , + I2400M_HDIv_MINOR_2 =2 , };
@@ -1009,18 +1009,14 @@ int i2400m_firmware_check(struct i2400m *i2400m) minor =le16_to_cpu (l4mv->minor); branch =le16_to_cpu (l4mv->branch); result = -EINVAL ; -if (major != I2400M_HDIv_MAJOR - && major != I2400M_HDIv_MAJOR_2) { -dev_err (dev,"unsupported major fw interface version " +if (major != I2400M_HDIv_MAJOR) { +dev_err (dev,"unsupported major fw version " "%u.%u.%u\n" , major, minor, branch); goto error_bad_major; } -if (major == I2400M_HDIv_MAJOR_2) -dev_err (dev,"deprecated major fw interface version " -"%u.%u.%u\n" , major, minor, branch); result =0 ; -if (minor != I2400M_HDIv_MINOR) -dev_warn (dev,"untested minor fw firmware version %u.%u.%u\n" , +if (minor < I2400M_HDIv_MINOR_2 && minor > I2400M_HDIv_MINOR) +dev_warn (dev,"untested minor fw version %u.%u.%u\n" , major, minor, branch); error_bad_major: dev_info(dev, "firmware interface version %u.%u.%u\n",
Signature · 1 line
1.5.6.5
PATCH 1/1 wimax/i2400m: support extended data RX protocol (no need to reallocate skbs)
In reply to Inaky Perez-GonzalezNewer i2400m firmwares (>= v1.4) extend the data RX protocol so that each packet has a 16 byte header. This header is mainly used to implement host reordeing (which is addressed in later commits).
However, this header also allows us to overwrite it (once data has been extracted) with an Ethernet header and deliver to the networking stack without having to reallocate the skb (as it happened in fw <= v1.3) to make room for it.
- control.c: indicate the device [dev_initialize()] that the driver wants to use the extended data RX protocol. Also involves adding the definition of the needed data types in include/linux/wimax/i2400m.h.
- rx.c: handle the new payload type for the extended RX data protocol. Prepares the skb for delivery to netdev.c:i2400m_net_erx().
- netdev.c: Introduce i2400m_net_erx() that adds the fake ethernet address to a prepared skb and delivers it to the networking stack.
- cleanup: in most instances in rx.c, the variable 'single' was renamed to 'single_last' for it better conveys its meaning.
--- drivers/net/wimax/i2400m/control.c | 9 +++ drivers/net/wimax/i2400m/i2400m.h | 2 + drivers/net/wimax/i2400m/netdev.c | 104 ++++++++++++++++++++++++-------- drivers/net/wimax/i2400m/rx.c | 117 +++++++++++++++++++++++++++++++++--- include/linux/wimax/i2400m.h | 35 +++++++++++ 5 files changed, 234 insertions(+), 33 deletions(-)
drivers/net/wimax/i2400m/control.c +9 -0
@@ -1311,6 +1311,7 @@ int i2400m_dev_initialize(struct i2400m *i2400m)struct device *dev =i2400m_dev (i2400m);struct i2400m_tlv_config_idle_parameters idle_params;struct i2400m_tlv_config_idle_timeout idle_timeout; +struct i2400m_tlv_config_d2h_data_format df;const struct i2400m_tlv_hdr *args[9 ];unsigned argc =0 ;
@@ -1333,6 +1334,14 @@ int i2400m_dev_initialize(struct i2400m *i2400m) args[argc++] = &idle_timeout.hdr; } } +if (i2400m_ge_v1_4 (i2400m)) { + df.hdr.type = +cpu_to_le16 (I2400M_TLV_CONFIG_D2H_DATA_FORMAT ); + df.hdr.length =cpu_to_le16 ( +sizeof (df) -sizeof (df.hdr)); + df.format =1 ; + args[argc++] = &df.hdr; + } result =i2400m_set_init_config (i2400m, args, argc);if (result <0 ) goto error;
drivers/net/wimax/i2400m/i2400m.h +2 -0
@@ -593,6 +593,8 @@ extern void i2400m_tx_release(struct i2400m *);extern void i2400m_net_rx (struct i2400m *,struct sk_buff *,unsigned ,const void *,int ); +extern void i2400m_net_erx (struct i2400m *,struct sk_buff *, +enum i2400m_cs );enum i2400m_pt ;extern int i2400m_tx (struct i2400m *,const void *,size_t ,enum i2400m_pt );
drivers/net/wimax/i2400m/netdev.c +79 -25
148 lines not on this page · raw message
drivers/net/wimax/i2400m/rx.c +109 -8
181 lines not on this page · raw message
include/linux/wimax/i2400m.h +35 -0
@@ -207,6 +207,7 @@ enum i2400m_pt {I2400M_PT_TRACE ,/* For device debug */ I2400M_PT_RESET_WARM ,/* device reset */ I2400M_PT_RESET_COLD ,/* USB[transport] reset, like reconnect */ +I2400M_PT_EDATA ,/* Extended RX data */ I2400M_PT_ILLEGAL };
@@ -221,6 +222,32 @@ struct i2400m_pl_data_hdr { } __attribute__((packed)); +/* +* Payload for an extended data packet +* +* New in v1.4 +* +* @cs: the type of data in the packet, as defined per (802.16e +* T11.13.19.1). Currently only 2 (IPv4 packet) supported. +* +* This is prefixed to each and every INCOMING DATA packet. +*/ +struct i2400m_pl_edata_hdr { +__le32 reorder; +__u8 cs; +__u8 reserved[11 ]; +} __attribute__((packed)); + +enum i2400m_cs { +I2400M_CS_IPV4_0 =0 , +I2400M_CS_IPV4 =2 , +}; + +enum i2400m_reorder { +I2400M_REORDER_NEEDED =0x01 , +}; + +/* Misc constants */ enum {I2400M_PL_PAD =16 ,/* Payload data size alignment */
@@ -382,6 +409,7 @@ enum i2400m_tlv {I2400M_TLV_DEVICE_RESET_TYPE =132 ,I2400M_TLV_CONFIG_IDLE_PARAMETERS =601 ,I2400M_TLV_CONFIG_IDLE_TIMEOUT =611 , + I2400M_TLV_CONFIG_D2H_DATA_FORMAT = 614, };
@@ -518,5 +546,12 @@ struct i2400m_tlv_config_idle_timeout {* 0 disabled */ } __attribute__((packed)); +/* New in v1.4 -- for backward compat, will be removed */ +struct i2400m_tlv_config_d2h_data_format { +struct i2400m_tlv_hdr hdr; +__u8 format;/* 0 old format, 1 enhanced */ +__u8 reserved[3 ]; +} __attribute__((packed)); +#endif /* #ifndef __LINUX__WIMAX__I2400M_H__ */
Signature · 1 line
1.5.6.5
PATCH 1/1 wimax: replace uses of __constant_{endian}
From: Harvey Harrison <[email protected]>
Base versions handle constant folding now.
Edited by Inaky to fix conflicts due to changes in netdev.c
--- drivers/net/wimax/i2400m/netdev.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-)
drivers/net/wimax/i2400m/netdev.c +6 -4
@@ -402,13 +402,13 @@ void i2400m_tx_timeout(struct net_device *net_dev)*/ static void i2400m_rx_fake_eth_header (struct net_device *net_dev, -void *_eth_hdr,int protocol) +void *_eth_hdr,__be16 protocol) {struct ethhdr *eth_hdr = _eth_hdr;memcpy (eth_hdr->h_dest, net_dev->dev_addr,sizeof (eth_hdr->h_dest));memset (eth_hdr->h_source,0 ,sizeof (eth_hdr->h_dest)); - eth_hdr->h_proto =cpu_to_be16 (protocol); + eth_hdr->h_proto = protocol; }
@@ -474,7 +474,8 @@ void i2400m_net_rx(struct i2400m *i2400m, struct sk_buff *skb_rx,memcpy (skb_put (skb, buf_len), buf, buf_len); }i2400m_rx_fake_eth_header (i2400m->wimax_dev.net_dev, - skb->data -ETH_HLEN ,ETH_P_IP ); + skb->data -ETH_HLEN , +cpu_to_be16 (ETH_P_IP ));skb_set_mac_header (skb, -ETH_HLEN ); skb->dev = i2400m->wimax_dev.net_dev; skb->protocol =htons (ETH_P_IP );
@@ -526,7 +527,8 @@ void i2400m_net_erx(struct i2400m *i2400m, struct sk_buff *skb,case I2400M_CS_IPV4 : protocol =ETH_P_IP ;i2400m_rx_fake_eth_header (i2400m->wimax_dev.net_dev, - skb->data -ETH_HLEN ,ETH_P_IP ); + skb->data -ETH_HLEN , +cpu_to_be16 (ETH_P_IP ));skb_set_mac_header (skb, -ETH_HLEN ); skb->dev = i2400m->wimax_dev.net_dev; skb->protocol =htons (ETH_P_IP );
Signature · 1 line
1.5.6.5
PATCH 1/1 wimax/i2400m: implement RX reorder support
Allow the device to give the driver RX data with reorder information.
When that is done, the device will indicate the driver if a packet has to be held in a (sorted) queue. It will also tell the driver when held packets have to be released to the OS.
This is done to improve the WiMAX-protocol level retransmission support when missing frames are detected.
The code docs provide details about the implementation.
In general, this just hooks into the RX path in rx.c; if a packet with the reorder bit in the RX header is detected, the reorder information in the header is extracted and one of the four main reorder operations are executed. In one case (queue) no packet will be delivered to the networking stack, just queued, whereas in the others (reset, update_ws and queue_update_ws), queued packet might be delivered depending on the window start for the specific queue.
The modifications to files other than rx.c are:
- control.c: during device initialization, enable reordering support if the rx_reorder_disabled module parameter is not enabled
- driver.c: expose a rx_reorder_disable module parameter and call i2400m_rx_setup/release() to initialize/shutdown RX reorder support.
- i2400m.h: introduce members in 'struct i2400m' needed for implementing reorder support.
- linux/i2400m.h: introduce TLVs, commands and constant definitions related to RX reorder
Last but not least, the rx reorder code includes an small circular log where the last N reorder operations are recorded to be displayed in case of inconsistency. Otherwise diagnosing issues would be almost impossible.
--- drivers/net/wimax/i2400m/control.c | 14 + drivers/net/wimax/i2400m/driver.c | 11 + drivers/net/wimax/i2400m/i2400m.h | 19 +- drivers/net/wimax/i2400m/rx.c | 677 ++++++++++++++++++++++++++++++++++-- include/linux/wimax/i2400m.h | 32 ++- 5 files changed, 723 insertions(+), 30 deletions(-)
drivers/net/wimax/i2400m/control.c +14 -0
@@ -1312,10 +1312,12 @@ int i2400m_dev_initialize(struct i2400m *i2400m)struct i2400m_tlv_config_idle_parameters idle_params;struct i2400m_tlv_config_idle_timeout idle_timeout;struct i2400m_tlv_config_d2h_data_format df; +struct i2400m_tlv_config_dl_host_reorder dlhr;const struct i2400m_tlv_hdr *args[9 ];unsigned argc =0 ;d_fnstart (3 , dev,"(i2400m %p)\n" , i2400m); +/* Disable idle mode? (enabled by default) */ if (i2400m_idle_mode_disabled) {if (i2400m_le_v1_3 (i2400m)) { idle_params.hdr.type =
@@ -1335,12 +1337,24 @@ int i2400m_dev_initialize(struct i2400m *i2400m) } }if (i2400m_ge_v1_4 (i2400m)) { +/* Enable extended RX data format? */ df.hdr.type =cpu_to_le16 (I2400M_TLV_CONFIG_D2H_DATA_FORMAT ); df.hdr.length =cpu_to_le16 (sizeof (df) -sizeof (df.hdr)); df.format =1 ; args[argc++] = &df.hdr; + +/* Enable RX data reordering? +* (switch flipped in rx.c:i2400m_rx_setup() after fw upload) */ +if (i2400m->rx_reorder) { + dlhr.hdr.type = +cpu_to_le16 (I2400M_TLV_CONFIG_DL_HOST_REORDER ); + dlhr.hdr.length =cpu_to_le16 ( +sizeof (dlhr) -sizeof (dlhr.hdr)); + dlhr.reorder =1 ; + args[argc++] = &dlhr.hdr; + } } result =i2400m_set_init_config (i2400m, args, argc);if (result <0 )
drivers/net/wimax/i2400m/driver.c +11 -0
@@ -76,6 +76,11 @@ MODULE_PARM_DESC(idle_mode_disabled,"If true, the device will not enable idle mode negotiation " "with the base station (when connected) to save power."); +int i2400m_rx_reorder_disabled;/* 0 (rx reorder enabled) by default */ +module_param_named (rx_reorder_disabled, i2400m_rx_reorder_disabled, int,0644 ); +MODULE_PARM_DESC (rx_reorder_disabled, +"If true, RX reordering will be disabled." ); +/** * i2400m_queue_work - schedule work on a i2400m's queue *
@@ -396,6 +401,9 @@ retry: result =i2400m_tx_setup (i2400m);if (result <0 ) goto error_tx_setup; + result =i2400m_rx_setup (i2400m); +if (result <0 ) + goto error_rx_setup; result = i2400m->bus_dev_start (i2400m);if (result <0 ) goto error_bus_dev_start;
@@ -430,6 +438,8 @@ error_fw_check: error_create_workqueue: i2400m->bus_dev_stop (i2400m); error_bus_dev_start: +i2400m_rx_release (i2400m); +error_rx_setup:i2400m_tx_release (i2400m); error_tx_setup: error_bootstrap:
@@ -477,6 +487,7 @@ void __i2400m_dev_stop(struct i2400m *i2400m) i2400m->ready =0 ;destroy_workqueue (i2400m->work_queue); i2400m->bus_dev_stop (i2400m); +i2400m_rx_release (i2400m);i2400m_tx_release (i2400m);wimax_state_change (wimax_dev,WIMAX_ST_DOWN );d_fnend (3 , dev,"(i2400m %p) = 0\n" , i2400m);
drivers/net/wimax/i2400m/i2400m.h +18 -1
@@ -174,6 +174,7 @@ enum i2400m_reset_type { };struct i2400m_reset_ctx ; +struct i2400m_roq ;/** * struct i2400m - descriptor for an Intel 2400m
@@ -257,6 +258,9 @@ struct i2400m_reset_ctx;* force this to be the first field so that we can get from * netdev_priv() the right pointer. * +* @rx_reorder: 1 if RX reordering is enabled; this can only be +* set at probe time. +* * @state: device's state (as reported by it) * * @state_wq: waitqueue that is woken up whenever the state changes
@@ -313,6 +317,12 @@ struct i2400m_reset_ctx;* * @rx_size_max: buggest RX message received. * +* @rx_roq: RX ReOrder queues. (fw >= v1.4) When packets are received +* out of order, the device will ask the driver to hold certain +* packets until the ones that are received out of order can be +* delivered. Then the driver can release them to the host. See +* drivers/net/i2400m/rx.c for details. +* * @init_mutex: Mutex used for serializing the device bringup * sequence; this way if the device reboots in the middle, we * don't try to do a bringup again while we are tearing down the
@@ -377,6 +387,7 @@ struct i2400m { unsigned boot_mode:1; /* is the device in boot mode? */ unsigned sboot:1; /* signed or unsigned fw boot */ unsigned ready:1; /* all probing steps done */ + unsigned rx_reorder:1; /* RX reorder is enabled */u8 trace_msg_from_user;/* echo rx msgs to 'trace' pipe */ /* typed u8 so debugfs/u8 can tweak */ enum i2400m_system_state state;
@@ -405,10 +416,11 @@ struct i2400m {unsigned tx_pl_num, tx_pl_max, tx_pl_min, tx_num, tx_size_acc, tx_size_min, tx_size_max; -/* RX stats */ +/* RX stuff */ spinlock_t rx_lock;/* protect RX state */ unsigned rx_pl_num, rx_pl_max, rx_pl_min, rx_num, rx_size_acc, rx_size_min, rx_size_max; +struct i2400m_roq *rx_roq;/* not under rx_lock! */ struct mutex msg_mutex;/* serialize command execution */ struct completion msg_completion;
@@ -442,6 +454,7 @@ void i2400m_init(struct i2400m *i2400m)wimax_dev_init (&i2400m->wimax_dev); i2400m->boot_mode =1 ; + i2400m->rx_reorder =1 ;init_waitqueue_head (&i2400m->state_wq);spin_lock_init (&i2400m->tx_lock);
@@ -591,6 +604,9 @@ extern int i2400m_tx_setup(struct i2400m *);extern void i2400m_wake_tx_work (struct work_struct *);extern void i2400m_tx_release (struct i2400m *); +extern int i2400m_rx_setup (struct i2400m *); +extern void i2400m_rx_release (struct i2400m *); +extern void i2400m_net_rx (struct i2400m *,struct sk_buff *,unsigned ,const void *,int ); extern void i2400m_net_erx(struct i2400m *, struct sk_buff *,
@@ -788,6 +804,7 @@ void __i2400m_msleep(unsigned ms)/* Module parameters */ extern int i2400m_idle_mode_disabled; +extern int i2400m_rx_reorder_disabled;#endif /* #ifndef __I2400M_H__ */
drivers/net/wimax/i2400m/rx.c +652 -25
747 lines not on this page · raw message
include/linux/wimax/i2400m.h +28 -4
@@ -225,15 +225,16 @@ struct i2400m_pl_data_hdr {/* * Payload for an extended data packet * -* New in v1.4 +* New in fw v1.4 * +* @reorder: if this payload has to be reorder or not (and how) * @cs: the type of data in the packet, as defined per (802.16e * T11.13.19.1). Currently only 2 (IPv4 packet) supported. * * This is prefixed to each and every INCOMING DATA packet. */ struct i2400m_pl_edata_hdr { -__le32 reorder; +__le32 reorder;/* bits defined in i2400m_ro */ __u8 cs;__u8 reserved[11 ]; } __attribute__((packed));
@@ -243,8 +244,23 @@ enum i2400m_cs { I2400M_CS_IPV4 = 2, }; -enum i2400m_reorder { -I2400M_REORDER_NEEDED =0x01 , +enum i2400m_ro { +I2400M_RO_NEEDED =0x01 , +I2400M_RO_TYPE =0x03 , +I2400M_RO_TYPE_SHIFT =1 , +I2400M_RO_CIN =0x0f , +I2400M_RO_CIN_SHIFT =4 , +I2400M_RO_FBN =0x07ff , +I2400M_RO_FBN_SHIFT =8 , +I2400M_RO_SN =0x07ff , +I2400M_RO_SN_SHIFT =21 , +}; + +enum i2400m_ro_type { +I2400M_RO_TYPE_RESET =0 , +I2400M_RO_TYPE_PACKET , +I2400M_RO_TYPE_WS , +I2400M_RO_TYPE_PACKET_WS , };
@@ -410,6 +426,7 @@ enum i2400m_tlv {I2400M_TLV_CONFIG_IDLE_PARAMETERS =601 ,I2400M_TLV_CONFIG_IDLE_TIMEOUT =611 ,I2400M_TLV_CONFIG_D2H_DATA_FORMAT =614 , + I2400M_TLV_CONFIG_DL_HOST_REORDER = 615, };
@@ -553,5 +570,12 @@ struct i2400m_tlv_config_d2h_data_format {__u8 reserved[3 ]; } __attribute__((packed)); +/* New in v1.4 */ +struct i2400m_tlv_config_dl_host_reorder { +struct i2400m_tlv_hdr hdr; +__u8 reorder;/* 0 disabled, 1 enabled */ +__u8 reserved[3 ]; +} __attribute__((packed)); +#endif /* #ifndef __LINUX__WIMAX__I2400M_H__ */
Signature · 1 line
1.5.6.5
PATCH 1/1 WiMAX-next for 2.6.30
In reply to Inaky Perez-GonzalezApologies, I just realized I missed sending the cover letter
This patch series corresponds to the wimax-next tree as it stands today, with feature additions for the i2400m driver:
- support extended data-RX protocol and data-RX reordering
- ability to query for a list of firmware files if the default doesn't work
- control of base station idle mode timeout (with firmware >= 1.4).
The wimax stack NAP level interface (scan, connect, disconnect, etc) that has been proposed in the mailing list is still not really ready for merging, so it will be kept in a branch of wimax-next.
Harvey Harrison (1):
wimax: replace uses of __constant_{endian}
Inaky Perez-Gonzalez (6):
wimax/i2400m: add the ability to fallback to other firmware files if
the default is not there
wimax/i2400m: drop support for deprecated major fw interface, add for
new minor
wimax/i2400m: firmware_check() encodes the firmware version in
i2400m->fw_version
wimax/i2400m: allow control of the base-station idle mode timeout wimax/i2400m: support extended data RX protocol (no need to
reallocate skbs)
wimax/i2400m: implement RX reorder support
Kay Sievers (1):
wimax: struct device - replace bus_id with dev_name(), dev_set_name()
drivers/net/wimax/i2400m/Makefile | 1 + drivers/net/wimax/i2400m/control.c | 147 +++++- drivers/net/wimax/i2400m/debug-levels.h | 1 + drivers/net/wimax/i2400m/driver.c | 28 ++- drivers/net/wimax/i2400m/fw.c | 53 ++- drivers/net/wimax/i2400m/i2400m.h | 75 +++- drivers/net/wimax/i2400m/netdev.c | 106 ++++- drivers/net/wimax/i2400m/rx.c | 746 ++++++++++++++++++++++++++++++- drivers/net/wimax/i2400m/sdio.c | 11 +- drivers/net/wimax/i2400m/sysfs.c | 80 ++++ drivers/net/wimax/i2400m/usb-notif.c | 2 +- drivers/net/wimax/i2400m/usb.c | 14 +- include/linux/wimax/debug.h | 2 +- include/linux/wimax/i2400m.h | 69 +++ 14 files changed, 1240 insertions(+), 95 deletions(-) create mode 100644 drivers/net/wimax/i2400m/sysfs.c
Signature · 1 line
Inaky
Re: [PATCH] wimax: replace uses of __constant_{endian}
In reply to Inaky Perez-GonzalezQuoted 9 lines · Inaky Perez-Gonzalez
From: Harvey Harrison <[email protected]>
Base versions handle constant folding now.
Edited by Inaky to fix conflicts due to changes in
netdev.cSigned-off-by Harvey Harrison <[email protected]>Signed-off-by Inaky Perez-Gonzalez <[email protected]>---
I'm not sure the description matches the patch...or the rest of the patch is missing.
Harvey
Re: [PATCH] wimax: replace uses of __constant_{endian}
Quoted 5 lines · Harvey Harrison
Quoted 4 lines · Inaky Perez-Gonzalez
From: Harvey Harrison <[email protected]>
Base versions handle constant folding now.
Quoted 8 lines
Quoted 5 lines
Edited by Inaky to fix conflicts due to changes in
netdev.cSigned-off-by Harvey Harrison <[email protected]>Signed-off-by Inaky Perez-Gonzalez <[email protected]>---
I'm not sure the description matches the patch...or the rest of the patch is missing.
This is a conflict fix -- yours (the original) is still in the tree, (way) before this series.
However, some of the code merged in with my fixes conflicted with your edits, so only those are changed to reflect the new code (hence the "Edited" line).
Hope this clarifies
Signature · 1 line
Inaky
David Miller
maintainerRe: [PATCH] WiMAX-next for 2.6.30
In reply to Inaky Perez-GonzalezFrom: Inaky Perez-Gonzalez <[email protected]>
Date: Sun, 1 Mar 2009 01:56:50 -0800
Quoted 5 lines
Apologies, I just realized I missed sending the cover letter
This patch series corresponds to the wimax-next tree as it stands today, with feature additions for the i2400m driver:
Quoted 8 lines
- support extended data-RX protocol and data-RX reordering
- ability to query for a list of firmware files if the default doesn't work
- control of base station idle mode timeout (with firmware >= 1.4).The wimax stack NAP level interface (scan, connect, disconnect, etc) that has been proposed in the mailing list is still not really ready for merging, so it will be kept in a branch of wimax-next.
All applied to net-next-2.6, thanks!