qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-12-25 10:15:11 +02:00
Code

ledtrig-netdev: use dev_get_stats to get statistics on kernels >=2.6.30

Browse Source 
Fixes a possible NULL pointer dereference.


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18925 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
juhosg 2009-12-25 10:06:22 +00:00
parent b2525c9b8d
commit 7bb3d8d68d
3 changed files with 12 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
target/linux/generic-2.6/files-2.6.30/drivers/leds/ledtrig-netdev.c
View File

@ -46,7 +46,7 @@
* link: LED's normal state reflects whether the link is up (has carrier) or not * link: LED's normal state reflects whether the link is up (has carrier) or not
* tx: LED blinks on transmitted data * tx: LED blinks on transmitted data
* rx: LED blinks on receive data * rx: LED blinks on receive data
* *
* Some suggestions: * Some suggestions:
* *
* Simple link status LED: * Simple link status LED:
@ -307,7 +307,7 @@ done:
static void netdev_trig_timer(unsigned long arg) static void netdev_trig_timer(unsigned long arg)
{ {
struct led_netdev_data *trigger_data = (struct led_netdev_data *)arg; struct led_netdev_data *trigger_data = (struct led_netdev_data *)arg;
struct net_device_stats *dev_stats; const struct net_device_stats *dev_stats;
unsigned new_activity; unsigned new_activity;
write_lock(&trigger_data->lock); write_lock(&trigger_data->lock);
@ -317,11 +317,8 @@ static void netdev_trig_timer(unsigned long arg)
led_set_brightness(trigger_data->led_cdev, ((trigger_data->mode & MODE_LINK) != 0 && trigger_data->link_up) ? LED_FULL : LED_OFF); led_set_brightness(trigger_data->led_cdev, ((trigger_data->mode & MODE_LINK) != 0 && trigger_data->link_up) ? LED_FULL : LED_OFF);
goto no_restart; goto no_restart;
} }
#ifdef CONFIG_COMPAT_NET_DEV_OPS
dev_stats = trigger_data->net_dev->get_stats(trigger_data->net_dev); dev_stats = dev_get_stats(trigger_data->net_dev);
#else
dev_stats = trigger_data->net_dev->netdev_ops->ndo_get_stats(trigger_data->net_dev);
#endif
new_activity = new_activity =
((trigger_data->mode & MODE_TX) ? dev_stats->tx_packets : 0) + ((trigger_data->mode & MODE_TX) ? dev_stats->tx_packets : 0) +
((trigger_data->mode & MODE_RX) ? dev_stats->rx_packets : 0); ((trigger_data->mode & MODE_RX) ? dev_stats->rx_packets : 0);

11
target/linux/generic-2.6/files-2.6.31/drivers/leds/ledtrig-netdev.c
View File

@ -46,7 +46,7 @@
* link: LED's normal state reflects whether the link is up (has carrier) or not * link: LED's normal state reflects whether the link is up (has carrier) or not
* tx: LED blinks on transmitted data * tx: LED blinks on transmitted data
* rx: LED blinks on receive data * rx: LED blinks on receive data
* *
* Some suggestions: * Some suggestions:
* *
* Simple link status LED: * Simple link status LED:
@ -307,7 +307,7 @@ done:
static void netdev_trig_timer(unsigned long arg) static void netdev_trig_timer(unsigned long arg)
{ {
struct led_netdev_data *trigger_data = (struct led_netdev_data *)arg; struct led_netdev_data *trigger_data = (struct led_netdev_data *)arg;
struct net_device_stats *dev_stats; const struct net_device_stats *dev_stats;
unsigned new_activity; unsigned new_activity;
write_lock(&trigger_data->lock); write_lock(&trigger_data->lock);
@ -317,11 +317,8 @@ static void netdev_trig_timer(unsigned long arg)
led_set_brightness(trigger_data->led_cdev, ((trigger_data->mode & MODE_LINK) != 0 && trigger_data->link_up) ? LED_FULL : LED_OFF); led_set_brightness(trigger_data->led_cdev, ((trigger_data->mode & MODE_LINK) != 0 && trigger_data->link_up) ? LED_FULL : LED_OFF);
goto no_restart; goto no_restart;
} }
#ifdef CONFIG_COMPAT_NET_DEV_OPS
dev_stats = trigger_data->net_dev->get_stats(trigger_data->net_dev); dev_stats = dev_get_stats(trigger_data->net_dev);
#else
dev_stats = trigger_data->net_dev->netdev_ops->ndo_get_stats(trigger_data->net_dev);
#endif
new_activity = new_activity =
((trigger_data->mode & MODE_TX) ? dev_stats->tx_packets : 0) + ((trigger_data->mode & MODE_TX) ? dev_stats->tx_packets : 0) +
((trigger_data->mode & MODE_RX) ? dev_stats->rx_packets : 0); ((trigger_data->mode & MODE_RX) ? dev_stats->rx_packets : 0);

11
target/linux/generic-2.6/files-2.6.32/drivers/leds/ledtrig-netdev.c
View File

@ -46,7 +46,7 @@
* link: LED's normal state reflects whether the link is up (has carrier) or not * link: LED's normal state reflects whether the link is up (has carrier) or not
* tx: LED blinks on transmitted data * tx: LED blinks on transmitted data
* rx: LED blinks on receive data * rx: LED blinks on receive data
* *
* Some suggestions: * Some suggestions:
* *
* Simple link status LED: * Simple link status LED:
@ -307,7 +307,7 @@ done:
static void netdev_trig_timer(unsigned long arg) static void netdev_trig_timer(unsigned long arg)
{ {
struct led_netdev_data *trigger_data = (struct led_netdev_data *)arg; struct led_netdev_data *trigger_data = (struct led_netdev_data *)arg;
struct net_device_stats *dev_stats; const struct net_device_stats *dev_stats;
unsigned new_activity; unsigned new_activity;
write_lock(&trigger_data->lock); write_lock(&trigger_data->lock);
@ -317,11 +317,8 @@ static void netdev_trig_timer(unsigned long arg)
led_set_brightness(trigger_data->led_cdev, ((trigger_data->mode & MODE_LINK) != 0 && trigger_data->link_up) ? LED_FULL : LED_OFF); led_set_brightness(trigger_data->led_cdev, ((trigger_data->mode & MODE_LINK) != 0 && trigger_data->link_up) ? LED_FULL : LED_OFF);
goto no_restart; goto no_restart;
} }
#ifdef CONFIG_COMPAT_NET_DEV_OPS
dev_stats = trigger_data->net_dev->get_stats(trigger_data->net_dev); dev_stats = dev_get_stats(trigger_data->net_dev);
#else
dev_stats = trigger_data->net_dev->netdev_ops->ndo_get_stats(trigger_data->net_dev);
#endif
new_activity = new_activity =
((trigger_data->mode & MODE_TX) ? dev_stats->tx_packets : 0) + ((trigger_data->mode & MODE_TX) ? dev_stats->tx_packets : 0) +
((trigger_data->mode & MODE_RX) ? dev_stats->rx_packets : 0); ((trigger_data->mode & MODE_RX) ? dev_stats->rx_packets : 0);