Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: amd8111e: Fix rx return code pktgen: fix multiple queue warning mac80211.h: fix kernel-doc excesses p54: fix build warnings ath5k: Reset key cache on interface up, thus fixing resume mac80211: correct warnings in minstrel rate control algorithm RFKILL: fix input layer initialisation p54: fix misbehavings when firmware can't be found dm9601: runtime mac address change support via-velocity: use driver string instead of dev->name before register_netdev() drivers/net/wan/syncppp: Fix unused-var warnings mlx4: Setting the correct offset for default mac address mlx4_en: remove duplicated #include ibm_newemac: Fix typo in flow control config option ehea: Detect 16GB hugepages for firmware restriction dmfe: check pci_alloc_consistent errors qeth: avoid skb_under_panic for malformatted inbound data qeth: remove unnecessary support ckeck in sysfs route6 qeth: fix offset error in non prealloc header path qeth: remove non-recover-thread checkings
This commit is contained in:
commit
3a7029d822
|
@ -833,12 +833,14 @@ static int amd8111e_rx_poll(struct napi_struct *napi, int budget)
|
||||||
|
|
||||||
} while(intr0 & RINT0);
|
} while(intr0 & RINT0);
|
||||||
|
|
||||||
/* Receive descriptor is empty now */
|
if (rx_pkt_limit > 0) {
|
||||||
spin_lock_irqsave(&lp->lock, flags);
|
/* Receive descriptor is empty now */
|
||||||
__netif_rx_complete(dev, napi);
|
spin_lock_irqsave(&lp->lock, flags);
|
||||||
writel(VAL0|RINTEN0, mmio + INTEN0);
|
__netif_rx_complete(dev, napi);
|
||||||
writel(VAL2 | RDMD0, mmio + CMD0);
|
writel(VAL0|RINTEN0, mmio + INTEN0);
|
||||||
spin_unlock_irqrestore(&lp->lock, flags);
|
writel(VAL2 | RDMD0, mmio + CMD0);
|
||||||
|
spin_unlock_irqrestore(&lp->lock, flags);
|
||||||
|
}
|
||||||
|
|
||||||
rx_not_empty:
|
rx_not_empty:
|
||||||
return num_rx_pkt;
|
return num_rx_pkt;
|
||||||
|
|
|
@ -40,7 +40,7 @@
|
||||||
#include <asm/io.h>
|
#include <asm/io.h>
|
||||||
|
|
||||||
#define DRV_NAME "ehea"
|
#define DRV_NAME "ehea"
|
||||||
#define DRV_VERSION "EHEA_0094"
|
#define DRV_VERSION "EHEA_0095"
|
||||||
|
|
||||||
/* eHEA capability flags */
|
/* eHEA capability flags */
|
||||||
#define DLPAR_PORT_ADD_REM 1
|
#define DLPAR_PORT_ADD_REM 1
|
||||||
|
|
|
@ -632,10 +632,13 @@ static void ehea_rebuild_busmap(void)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static int ehea_update_busmap(unsigned long pfn, unsigned long pgnum, int add)
|
static int ehea_update_busmap(unsigned long pfn, unsigned long nr_pages, int add)
|
||||||
{
|
{
|
||||||
unsigned long i, start_section, end_section;
|
unsigned long i, start_section, end_section;
|
||||||
|
|
||||||
|
if (!nr_pages)
|
||||||
|
return 0;
|
||||||
|
|
||||||
if (!ehea_bmap) {
|
if (!ehea_bmap) {
|
||||||
ehea_bmap = kzalloc(sizeof(struct ehea_bmap), GFP_KERNEL);
|
ehea_bmap = kzalloc(sizeof(struct ehea_bmap), GFP_KERNEL);
|
||||||
if (!ehea_bmap)
|
if (!ehea_bmap)
|
||||||
|
@ -643,7 +646,7 @@ static int ehea_update_busmap(unsigned long pfn, unsigned long pgnum, int add)
|
||||||
}
|
}
|
||||||
|
|
||||||
start_section = (pfn * PAGE_SIZE) / EHEA_SECTSIZE;
|
start_section = (pfn * PAGE_SIZE) / EHEA_SECTSIZE;
|
||||||
end_section = start_section + ((pgnum * PAGE_SIZE) / EHEA_SECTSIZE);
|
end_section = start_section + ((nr_pages * PAGE_SIZE) / EHEA_SECTSIZE);
|
||||||
/* Mark entries as valid or invalid only; address is assigned later */
|
/* Mark entries as valid or invalid only; address is assigned later */
|
||||||
for (i = start_section; i < end_section; i++) {
|
for (i = start_section; i < end_section; i++) {
|
||||||
u64 flag;
|
u64 flag;
|
||||||
|
@ -692,10 +695,54 @@ int ehea_rem_sect_bmap(unsigned long pfn, unsigned long nr_pages)
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int ehea_create_busmap_callback(unsigned long pfn,
|
static int ehea_is_hugepage(unsigned long pfn)
|
||||||
unsigned long nr_pages, void *arg)
|
|
||||||
{
|
{
|
||||||
return ehea_update_busmap(pfn, nr_pages, EHEA_BUSMAP_ADD_SECT);
|
int page_order;
|
||||||
|
|
||||||
|
if (pfn & EHEA_HUGEPAGE_PFN_MASK)
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
page_order = compound_order(pfn_to_page(pfn));
|
||||||
|
if (page_order + PAGE_SHIFT != EHEA_HUGEPAGESHIFT)
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int ehea_create_busmap_callback(unsigned long initial_pfn,
|
||||||
|
unsigned long total_nr_pages, void *arg)
|
||||||
|
{
|
||||||
|
int ret;
|
||||||
|
unsigned long pfn, start_pfn, end_pfn, nr_pages;
|
||||||
|
|
||||||
|
if ((total_nr_pages * PAGE_SIZE) < EHEA_HUGEPAGE_SIZE)
|
||||||
|
return ehea_update_busmap(initial_pfn, total_nr_pages,
|
||||||
|
EHEA_BUSMAP_ADD_SECT);
|
||||||
|
|
||||||
|
/* Given chunk is >= 16GB -> check for hugepages */
|
||||||
|
start_pfn = initial_pfn;
|
||||||
|
end_pfn = initial_pfn + total_nr_pages;
|
||||||
|
pfn = start_pfn;
|
||||||
|
|
||||||
|
while (pfn < end_pfn) {
|
||||||
|
if (ehea_is_hugepage(pfn)) {
|
||||||
|
/* Add mem found in front of the hugepage */
|
||||||
|
nr_pages = pfn - start_pfn;
|
||||||
|
ret = ehea_update_busmap(start_pfn, nr_pages,
|
||||||
|
EHEA_BUSMAP_ADD_SECT);
|
||||||
|
if (ret)
|
||||||
|
return ret;
|
||||||
|
|
||||||
|
/* Skip the hugepage */
|
||||||
|
pfn += (EHEA_HUGEPAGE_SIZE / PAGE_SIZE);
|
||||||
|
start_pfn = pfn;
|
||||||
|
} else
|
||||||
|
pfn += (EHEA_SECTSIZE / PAGE_SIZE);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Add mem found behind the hugepage(s) */
|
||||||
|
nr_pages = pfn - start_pfn;
|
||||||
|
return ehea_update_busmap(start_pfn, nr_pages, EHEA_BUSMAP_ADD_SECT);
|
||||||
}
|
}
|
||||||
|
|
||||||
int ehea_create_busmap(void)
|
int ehea_create_busmap(void)
|
||||||
|
|
|
@ -40,6 +40,9 @@
|
||||||
#define EHEA_PAGESIZE (1UL << EHEA_PAGESHIFT)
|
#define EHEA_PAGESIZE (1UL << EHEA_PAGESHIFT)
|
||||||
#define EHEA_SECTSIZE (1UL << 24)
|
#define EHEA_SECTSIZE (1UL << 24)
|
||||||
#define EHEA_PAGES_PER_SECTION (EHEA_SECTSIZE >> EHEA_PAGESHIFT)
|
#define EHEA_PAGES_PER_SECTION (EHEA_SECTSIZE >> EHEA_PAGESHIFT)
|
||||||
|
#define EHEA_HUGEPAGESHIFT 34
|
||||||
|
#define EHEA_HUGEPAGE_SIZE (1UL << EHEA_HUGEPAGESHIFT)
|
||||||
|
#define EHEA_HUGEPAGE_PFN_MASK ((EHEA_HUGEPAGE_SIZE - 1) >> PAGE_SHIFT)
|
||||||
|
|
||||||
#if ((1UL << SECTION_SIZE_BITS) < EHEA_SECTSIZE)
|
#if ((1UL << SECTION_SIZE_BITS) < EHEA_SECTSIZE)
|
||||||
#error eHEA module cannot work if kernel sectionsize < ehea sectionsize
|
#error eHEA module cannot work if kernel sectionsize < ehea sectionsize
|
||||||
|
|
|
@ -2605,7 +2605,7 @@ static int __devinit emac_init_config(struct emac_instance *dev)
|
||||||
of_device_is_compatible(np, "ibm,emac-440gr"))
|
of_device_is_compatible(np, "ibm,emac-440gr"))
|
||||||
dev->features |= EMAC_FTR_440EP_PHY_CLK_FIX;
|
dev->features |= EMAC_FTR_440EP_PHY_CLK_FIX;
|
||||||
if (of_device_is_compatible(np, "ibm,emac-405ez")) {
|
if (of_device_is_compatible(np, "ibm,emac-405ez")) {
|
||||||
#ifdef CONFIG_IBM_NEW_EMAC_NO_FLOW_CONTROL
|
#ifdef CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL
|
||||||
dev->features |= EMAC_FTR_NO_FLOW_CONTROL_40x;
|
dev->features |= EMAC_FTR_NO_FLOW_CONTROL_40x;
|
||||||
#else
|
#else
|
||||||
printk(KERN_ERR "%s: Flow control not disabled!\n",
|
printk(KERN_ERR "%s: Flow control not disabled!\n",
|
||||||
|
|
|
@ -35,7 +35,6 @@
|
||||||
#include <linux/module.h>
|
#include <linux/module.h>
|
||||||
#include <linux/delay.h>
|
#include <linux/delay.h>
|
||||||
#include <linux/netdevice.h>
|
#include <linux/netdevice.h>
|
||||||
#include <linux/cpumask.h>
|
|
||||||
|
|
||||||
#include <linux/mlx4/driver.h>
|
#include <linux/mlx4/driver.h>
|
||||||
#include <linux/mlx4/device.h>
|
#include <linux/mlx4/device.h>
|
||||||
|
|
|
@ -360,9 +360,9 @@ int mlx4_QUERY_DEV_CAP(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap)
|
||||||
#define QUERY_PORT_ETH_MTU_OFFSET 0x02
|
#define QUERY_PORT_ETH_MTU_OFFSET 0x02
|
||||||
#define QUERY_PORT_WIDTH_OFFSET 0x06
|
#define QUERY_PORT_WIDTH_OFFSET 0x06
|
||||||
#define QUERY_PORT_MAX_GID_PKEY_OFFSET 0x07
|
#define QUERY_PORT_MAX_GID_PKEY_OFFSET 0x07
|
||||||
#define QUERY_PORT_MAC_OFFSET 0x08
|
|
||||||
#define QUERY_PORT_MAX_MACVLAN_OFFSET 0x0a
|
#define QUERY_PORT_MAX_MACVLAN_OFFSET 0x0a
|
||||||
#define QUERY_PORT_MAX_VL_OFFSET 0x0b
|
#define QUERY_PORT_MAX_VL_OFFSET 0x0b
|
||||||
|
#define QUERY_PORT_MAC_OFFSET 0x10
|
||||||
|
|
||||||
for (i = 1; i <= dev_cap->num_ports; ++i) {
|
for (i = 1; i <= dev_cap->num_ports; ++i) {
|
||||||
err = mlx4_cmd_box(dev, 0, mailbox->dma, i, 0, MLX4_CMD_QUERY_PORT,
|
err = mlx4_cmd_box(dev, 0, mailbox->dma, i, 0, MLX4_CMD_QUERY_PORT,
|
||||||
|
|
|
@ -420,9 +420,13 @@ static int __devinit dmfe_init_one (struct pci_dev *pdev,
|
||||||
/* Allocate Tx/Rx descriptor memory */
|
/* Allocate Tx/Rx descriptor memory */
|
||||||
db->desc_pool_ptr = pci_alloc_consistent(pdev, sizeof(struct tx_desc) *
|
db->desc_pool_ptr = pci_alloc_consistent(pdev, sizeof(struct tx_desc) *
|
||||||
DESC_ALL_CNT + 0x20, &db->desc_pool_dma_ptr);
|
DESC_ALL_CNT + 0x20, &db->desc_pool_dma_ptr);
|
||||||
|
if (!db->desc_pool_ptr)
|
||||||
|
goto err_out_res;
|
||||||
|
|
||||||
db->buf_pool_ptr = pci_alloc_consistent(pdev, TX_BUF_ALLOC *
|
db->buf_pool_ptr = pci_alloc_consistent(pdev, TX_BUF_ALLOC *
|
||||||
TX_DESC_CNT + 4, &db->buf_pool_dma_ptr);
|
TX_DESC_CNT + 4, &db->buf_pool_dma_ptr);
|
||||||
|
if (!db->buf_pool_ptr)
|
||||||
|
goto err_out_free_desc;
|
||||||
|
|
||||||
db->first_tx_desc = (struct tx_desc *) db->desc_pool_ptr;
|
db->first_tx_desc = (struct tx_desc *) db->desc_pool_ptr;
|
||||||
db->first_tx_desc_dma = db->desc_pool_dma_ptr;
|
db->first_tx_desc_dma = db->desc_pool_dma_ptr;
|
||||||
|
@ -469,7 +473,7 @@ static int __devinit dmfe_init_one (struct pci_dev *pdev,
|
||||||
|
|
||||||
err = register_netdev (dev);
|
err = register_netdev (dev);
|
||||||
if (err)
|
if (err)
|
||||||
goto err_out_res;
|
goto err_out_free_buf;
|
||||||
|
|
||||||
printk(KERN_INFO "%s: Davicom DM%04lx at pci%s, "
|
printk(KERN_INFO "%s: Davicom DM%04lx at pci%s, "
|
||||||
"%s, irq %d.\n",
|
"%s, irq %d.\n",
|
||||||
|
@ -483,6 +487,12 @@ static int __devinit dmfe_init_one (struct pci_dev *pdev,
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
|
err_out_free_buf:
|
||||||
|
pci_free_consistent(pdev, TX_BUF_ALLOC * TX_DESC_CNT + 4,
|
||||||
|
db->buf_pool_ptr, db->buf_pool_dma_ptr);
|
||||||
|
err_out_free_desc:
|
||||||
|
pci_free_consistent(pdev, sizeof(struct tx_desc) * DESC_ALL_CNT + 0x20,
|
||||||
|
db->desc_pool_ptr, db->desc_pool_dma_ptr);
|
||||||
err_out_res:
|
err_out_res:
|
||||||
pci_release_regions(pdev);
|
pci_release_regions(pdev);
|
||||||
err_out_disable:
|
err_out_disable:
|
||||||
|
|
|
@ -396,6 +396,20 @@ static void dm9601_set_multicast(struct net_device *net)
|
||||||
dm_write_reg_async(dev, DM_RX_CTRL, rx_ctl);
|
dm_write_reg_async(dev, DM_RX_CTRL, rx_ctl);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int dm9601_set_mac_address(struct net_device *net, void *p)
|
||||||
|
{
|
||||||
|
struct sockaddr *addr = p;
|
||||||
|
struct usbnet *dev = netdev_priv(net);
|
||||||
|
|
||||||
|
if (!is_valid_ether_addr(addr->sa_data))
|
||||||
|
return -EINVAL;
|
||||||
|
|
||||||
|
memcpy(net->dev_addr, addr->sa_data, net->addr_len);
|
||||||
|
dm_write_async(dev, DM_PHY_ADDR, net->addr_len, net->dev_addr);
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
static int dm9601_bind(struct usbnet *dev, struct usb_interface *intf)
|
static int dm9601_bind(struct usbnet *dev, struct usb_interface *intf)
|
||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
|
@ -406,6 +420,7 @@ static int dm9601_bind(struct usbnet *dev, struct usb_interface *intf)
|
||||||
|
|
||||||
dev->net->do_ioctl = dm9601_ioctl;
|
dev->net->do_ioctl = dm9601_ioctl;
|
||||||
dev->net->set_multicast_list = dm9601_set_multicast;
|
dev->net->set_multicast_list = dm9601_set_multicast;
|
||||||
|
dev->net->set_mac_address = dm9601_set_mac_address;
|
||||||
dev->net->ethtool_ops = &dm9601_ethtool_ops;
|
dev->net->ethtool_ops = &dm9601_ethtool_ops;
|
||||||
dev->net->hard_header_len += DM_TX_OVERHEAD;
|
dev->net->hard_header_len += DM_TX_OVERHEAD;
|
||||||
dev->hard_mtu = dev->net->mtu + dev->net->hard_header_len;
|
dev->hard_mtu = dev->net->mtu + dev->net->hard_header_len;
|
||||||
|
|
|
@ -521,7 +521,7 @@ static void __devexit velocity_remove1(struct pci_dev *pdev)
|
||||||
* we don't duplicate code for each option.
|
* we don't duplicate code for each option.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
static void __devinit velocity_set_int_opt(int *opt, int val, int min, int max, int def, char *name, char *devname)
|
static void __devinit velocity_set_int_opt(int *opt, int val, int min, int max, int def, char *name, const char *devname)
|
||||||
{
|
{
|
||||||
if (val == -1)
|
if (val == -1)
|
||||||
*opt = def;
|
*opt = def;
|
||||||
|
@ -550,7 +550,7 @@ static void __devinit velocity_set_int_opt(int *opt, int val, int min, int max,
|
||||||
* we don't duplicate code for each option.
|
* we don't duplicate code for each option.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
static void __devinit velocity_set_bool_opt(u32 * opt, int val, int def, u32 flag, char *name, char *devname)
|
static void __devinit velocity_set_bool_opt(u32 * opt, int val, int def, u32 flag, char *name, const char *devname)
|
||||||
{
|
{
|
||||||
(*opt) &= (~flag);
|
(*opt) &= (~flag);
|
||||||
if (val == -1)
|
if (val == -1)
|
||||||
|
@ -576,7 +576,7 @@ static void __devinit velocity_set_bool_opt(u32 * opt, int val, int def, u32 fla
|
||||||
* for the current device
|
* for the current device
|
||||||
*/
|
*/
|
||||||
|
|
||||||
static void __devinit velocity_get_options(struct velocity_opt *opts, int index, char *devname)
|
static void __devinit velocity_get_options(struct velocity_opt *opts, int index, const char *devname)
|
||||||
{
|
{
|
||||||
|
|
||||||
velocity_set_int_opt(&opts->rx_thresh, rx_thresh[index], RX_THRESH_MIN, RX_THRESH_MAX, RX_THRESH_DEF, "rx_thresh", devname);
|
velocity_set_int_opt(&opts->rx_thresh, rx_thresh[index], RX_THRESH_MIN, RX_THRESH_MAX, RX_THRESH_DEF, "rx_thresh", devname);
|
||||||
|
@ -863,6 +863,7 @@ static int __devinit velocity_found1(struct pci_dev *pdev, const struct pci_devi
|
||||||
static int first = 1;
|
static int first = 1;
|
||||||
struct net_device *dev;
|
struct net_device *dev;
|
||||||
int i;
|
int i;
|
||||||
|
const char *drv_string;
|
||||||
const struct velocity_info_tbl *info = &chip_info_table[ent->driver_data];
|
const struct velocity_info_tbl *info = &chip_info_table[ent->driver_data];
|
||||||
struct velocity_info *vptr;
|
struct velocity_info *vptr;
|
||||||
struct mac_regs __iomem * regs;
|
struct mac_regs __iomem * regs;
|
||||||
|
@ -935,7 +936,9 @@ static int __devinit velocity_found1(struct pci_dev *pdev, const struct pci_devi
|
||||||
dev->dev_addr[i] = readb(®s->PAR[i]);
|
dev->dev_addr[i] = readb(®s->PAR[i]);
|
||||||
|
|
||||||
|
|
||||||
velocity_get_options(&vptr->options, velocity_nics, dev->name);
|
drv_string = dev_driver_string(&pdev->dev);
|
||||||
|
|
||||||
|
velocity_get_options(&vptr->options, velocity_nics, drv_string);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Mask out the options cannot be set to the chip
|
* Mask out the options cannot be set to the chip
|
||||||
|
|
|
@ -756,10 +756,11 @@ static void sppp_cisco_input (struct sppp *sp, struct sk_buff *skb)
|
||||||
case CISCO_ADDR_REQ:
|
case CISCO_ADDR_REQ:
|
||||||
/* Stolen from net/ipv4/devinet.c -- SIOCGIFADDR ioctl */
|
/* Stolen from net/ipv4/devinet.c -- SIOCGIFADDR ioctl */
|
||||||
{
|
{
|
||||||
struct in_device *in_dev;
|
|
||||||
struct in_ifaddr *ifa;
|
|
||||||
__be32 addr = 0, mask = htonl(~0U); /* FIXME: is the mask correct? */
|
__be32 addr = 0, mask = htonl(~0U); /* FIXME: is the mask correct? */
|
||||||
#ifdef CONFIG_INET
|
#ifdef CONFIG_INET
|
||||||
|
struct in_device *in_dev;
|
||||||
|
struct in_ifaddr *ifa;
|
||||||
|
|
||||||
rcu_read_lock();
|
rcu_read_lock();
|
||||||
if ((in_dev = __in_dev_get_rcu(dev)) != NULL)
|
if ((in_dev = __in_dev_get_rcu(dev)) != NULL)
|
||||||
{
|
{
|
||||||
|
|
|
@ -661,8 +661,7 @@ ath5k_pci_resume(struct pci_dev *pdev)
|
||||||
{
|
{
|
||||||
struct ieee80211_hw *hw = pci_get_drvdata(pdev);
|
struct ieee80211_hw *hw = pci_get_drvdata(pdev);
|
||||||
struct ath5k_softc *sc = hw->priv;
|
struct ath5k_softc *sc = hw->priv;
|
||||||
struct ath5k_hw *ah = sc->ah;
|
int err;
|
||||||
int i, err;
|
|
||||||
|
|
||||||
pci_restore_state(pdev);
|
pci_restore_state(pdev);
|
||||||
|
|
||||||
|
@ -688,16 +687,6 @@ ath5k_pci_resume(struct pci_dev *pdev)
|
||||||
goto err_irq;
|
goto err_irq;
|
||||||
ath5k_led_enable(sc);
|
ath5k_led_enable(sc);
|
||||||
|
|
||||||
/*
|
|
||||||
* Reset the key cache since some parts do not
|
|
||||||
* reset the contents on initial power up or resume.
|
|
||||||
*
|
|
||||||
* FIXME: This may need to be revisited when mac80211 becomes
|
|
||||||
* aware of suspend/resume.
|
|
||||||
*/
|
|
||||||
for (i = 0; i < AR5K_KEYTABLE_SIZE; i++)
|
|
||||||
ath5k_hw_reset_key(ah, i);
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
err_irq:
|
err_irq:
|
||||||
free_irq(pdev->irq, sc);
|
free_irq(pdev->irq, sc);
|
||||||
|
@ -718,7 +707,6 @@ ath5k_attach(struct pci_dev *pdev, struct ieee80211_hw *hw)
|
||||||
struct ath5k_softc *sc = hw->priv;
|
struct ath5k_softc *sc = hw->priv;
|
||||||
struct ath5k_hw *ah = sc->ah;
|
struct ath5k_hw *ah = sc->ah;
|
||||||
u8 mac[ETH_ALEN];
|
u8 mac[ETH_ALEN];
|
||||||
unsigned int i;
|
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
ATH5K_DBG(sc, ATH5K_DEBUG_ANY, "devid 0x%x\n", pdev->device);
|
ATH5K_DBG(sc, ATH5K_DEBUG_ANY, "devid 0x%x\n", pdev->device);
|
||||||
|
@ -736,13 +724,6 @@ ath5k_attach(struct pci_dev *pdev, struct ieee80211_hw *hw)
|
||||||
if (ret > 0)
|
if (ret > 0)
|
||||||
__set_bit(ATH_STAT_MRRETRY, sc->status);
|
__set_bit(ATH_STAT_MRRETRY, sc->status);
|
||||||
|
|
||||||
/*
|
|
||||||
* Reset the key cache since some parts do not
|
|
||||||
* reset the contents on initial power up.
|
|
||||||
*/
|
|
||||||
for (i = 0; i < AR5K_KEYTABLE_SIZE; i++)
|
|
||||||
ath5k_hw_reset_key(ah, i);
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Collect the channel list. The 802.11 layer
|
* Collect the channel list. The 802.11 layer
|
||||||
* is resposible for filtering this list based
|
* is resposible for filtering this list based
|
||||||
|
@ -2202,7 +2183,8 @@ ath5k_beacon_config(struct ath5k_softc *sc)
|
||||||
static int
|
static int
|
||||||
ath5k_init(struct ath5k_softc *sc, bool is_resume)
|
ath5k_init(struct ath5k_softc *sc, bool is_resume)
|
||||||
{
|
{
|
||||||
int ret;
|
struct ath5k_hw *ah = sc->ah;
|
||||||
|
int ret, i;
|
||||||
|
|
||||||
mutex_lock(&sc->lock);
|
mutex_lock(&sc->lock);
|
||||||
|
|
||||||
|
@ -2235,10 +2217,17 @@ ath5k_init(struct ath5k_softc *sc, bool is_resume)
|
||||||
if (ret)
|
if (ret)
|
||||||
goto done;
|
goto done;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Reset the key cache since some parts do not reset the
|
||||||
|
* contents on initial power up or resume from suspend.
|
||||||
|
*/
|
||||||
|
for (i = 0; i < AR5K_KEYTABLE_SIZE; i++)
|
||||||
|
ath5k_hw_reset_key(ah, i);
|
||||||
|
|
||||||
__set_bit(ATH_STAT_STARTED, sc->status);
|
__set_bit(ATH_STAT_STARTED, sc->status);
|
||||||
|
|
||||||
/* Set ack to be sent at low bit-rates */
|
/* Set ack to be sent at low bit-rates */
|
||||||
ath5k_hw_set_ack_bitrate_high(sc->ah, false);
|
ath5k_hw_set_ack_bitrate_high(ah, false);
|
||||||
|
|
||||||
mod_timer(&sc->calib_tim, round_jiffies(jiffies +
|
mod_timer(&sc->calib_tim, round_jiffies(jiffies +
|
||||||
msecs_to_jiffies(ath5k_calinterval * 1000)));
|
msecs_to_jiffies(ath5k_calinterval * 1000)));
|
||||||
|
|
|
@ -319,7 +319,7 @@ static int p54_parse_eeprom(struct ieee80211_hw *dev, void *eeprom, int len)
|
||||||
void *tmp;
|
void *tmp;
|
||||||
int err;
|
int err;
|
||||||
u8 *end = (u8 *)eeprom + len;
|
u8 *end = (u8 *)eeprom + len;
|
||||||
u16 synth;
|
u16 synth = 0;
|
||||||
DECLARE_MAC_BUF(mac);
|
DECLARE_MAC_BUF(mac);
|
||||||
|
|
||||||
wrap = (struct eeprom_pda_wrap *) eeprom;
|
wrap = (struct eeprom_pda_wrap *) eeprom;
|
||||||
|
@ -422,7 +422,8 @@ static int p54_parse_eeprom(struct ieee80211_hw *dev, void *eeprom, int len)
|
||||||
entry = (void *)entry + (entry_len + 1)*2;
|
entry = (void *)entry + (entry_len + 1)*2;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!priv->iq_autocal || !priv->output_limit || !priv->curve_data) {
|
if (!synth || !priv->iq_autocal || !priv->output_limit ||
|
||||||
|
!priv->curve_data) {
|
||||||
printk(KERN_ERR "p54: not all required entries found in eeprom!\n");
|
printk(KERN_ERR "p54: not all required entries found in eeprom!\n");
|
||||||
err = -EINVAL;
|
err = -EINVAL;
|
||||||
goto err;
|
goto err;
|
||||||
|
|
|
@ -346,68 +346,6 @@ static void p54p_tx(struct ieee80211_hw *dev, struct p54_control_hdr *data,
|
||||||
printk(KERN_INFO "%s: tx overflow.\n", wiphy_name(dev->wiphy));
|
printk(KERN_INFO "%s: tx overflow.\n", wiphy_name(dev->wiphy));
|
||||||
}
|
}
|
||||||
|
|
||||||
static int p54p_open(struct ieee80211_hw *dev)
|
|
||||||
{
|
|
||||||
struct p54p_priv *priv = dev->priv;
|
|
||||||
int err;
|
|
||||||
|
|
||||||
init_completion(&priv->boot_comp);
|
|
||||||
err = request_irq(priv->pdev->irq, &p54p_interrupt,
|
|
||||||
IRQF_SHARED, "p54pci", dev);
|
|
||||||
if (err) {
|
|
||||||
printk(KERN_ERR "%s: failed to register IRQ handler\n",
|
|
||||||
wiphy_name(dev->wiphy));
|
|
||||||
return err;
|
|
||||||
}
|
|
||||||
|
|
||||||
memset(priv->ring_control, 0, sizeof(*priv->ring_control));
|
|
||||||
err = p54p_upload_firmware(dev);
|
|
||||||
if (err) {
|
|
||||||
free_irq(priv->pdev->irq, dev);
|
|
||||||
return err;
|
|
||||||
}
|
|
||||||
priv->rx_idx_data = priv->tx_idx_data = 0;
|
|
||||||
priv->rx_idx_mgmt = priv->tx_idx_mgmt = 0;
|
|
||||||
|
|
||||||
p54p_refill_rx_ring(dev, 0, priv->ring_control->rx_data,
|
|
||||||
ARRAY_SIZE(priv->ring_control->rx_data), priv->rx_buf_data);
|
|
||||||
|
|
||||||
p54p_refill_rx_ring(dev, 2, priv->ring_control->rx_mgmt,
|
|
||||||
ARRAY_SIZE(priv->ring_control->rx_mgmt), priv->rx_buf_mgmt);
|
|
||||||
|
|
||||||
P54P_WRITE(ring_control_base, cpu_to_le32(priv->ring_control_dma));
|
|
||||||
P54P_READ(ring_control_base);
|
|
||||||
wmb();
|
|
||||||
udelay(10);
|
|
||||||
|
|
||||||
P54P_WRITE(int_enable, cpu_to_le32(ISL38XX_INT_IDENT_INIT));
|
|
||||||
P54P_READ(int_enable);
|
|
||||||
wmb();
|
|
||||||
udelay(10);
|
|
||||||
|
|
||||||
P54P_WRITE(dev_int, cpu_to_le32(ISL38XX_DEV_INT_RESET));
|
|
||||||
P54P_READ(dev_int);
|
|
||||||
|
|
||||||
if (!wait_for_completion_interruptible_timeout(&priv->boot_comp, HZ)) {
|
|
||||||
printk(KERN_ERR "%s: Cannot boot firmware!\n",
|
|
||||||
wiphy_name(dev->wiphy));
|
|
||||||
free_irq(priv->pdev->irq, dev);
|
|
||||||
return -ETIMEDOUT;
|
|
||||||
}
|
|
||||||
|
|
||||||
P54P_WRITE(int_enable, cpu_to_le32(ISL38XX_INT_IDENT_UPDATE));
|
|
||||||
P54P_READ(int_enable);
|
|
||||||
wmb();
|
|
||||||
udelay(10);
|
|
||||||
|
|
||||||
P54P_WRITE(dev_int, cpu_to_le32(ISL38XX_DEV_INT_UPDATE));
|
|
||||||
P54P_READ(dev_int);
|
|
||||||
wmb();
|
|
||||||
udelay(10);
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void p54p_stop(struct ieee80211_hw *dev)
|
static void p54p_stop(struct ieee80211_hw *dev)
|
||||||
{
|
{
|
||||||
struct p54p_priv *priv = dev->priv;
|
struct p54p_priv *priv = dev->priv;
|
||||||
|
@ -474,6 +412,68 @@ static void p54p_stop(struct ieee80211_hw *dev)
|
||||||
memset(ring_control, 0, sizeof(*ring_control));
|
memset(ring_control, 0, sizeof(*ring_control));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int p54p_open(struct ieee80211_hw *dev)
|
||||||
|
{
|
||||||
|
struct p54p_priv *priv = dev->priv;
|
||||||
|
int err;
|
||||||
|
|
||||||
|
init_completion(&priv->boot_comp);
|
||||||
|
err = request_irq(priv->pdev->irq, &p54p_interrupt,
|
||||||
|
IRQF_SHARED, "p54pci", dev);
|
||||||
|
if (err) {
|
||||||
|
printk(KERN_ERR "%s: failed to register IRQ handler\n",
|
||||||
|
wiphy_name(dev->wiphy));
|
||||||
|
return err;
|
||||||
|
}
|
||||||
|
|
||||||
|
memset(priv->ring_control, 0, sizeof(*priv->ring_control));
|
||||||
|
err = p54p_upload_firmware(dev);
|
||||||
|
if (err) {
|
||||||
|
free_irq(priv->pdev->irq, dev);
|
||||||
|
return err;
|
||||||
|
}
|
||||||
|
priv->rx_idx_data = priv->tx_idx_data = 0;
|
||||||
|
priv->rx_idx_mgmt = priv->tx_idx_mgmt = 0;
|
||||||
|
|
||||||
|
p54p_refill_rx_ring(dev, 0, priv->ring_control->rx_data,
|
||||||
|
ARRAY_SIZE(priv->ring_control->rx_data), priv->rx_buf_data);
|
||||||
|
|
||||||
|
p54p_refill_rx_ring(dev, 2, priv->ring_control->rx_mgmt,
|
||||||
|
ARRAY_SIZE(priv->ring_control->rx_mgmt), priv->rx_buf_mgmt);
|
||||||
|
|
||||||
|
P54P_WRITE(ring_control_base, cpu_to_le32(priv->ring_control_dma));
|
||||||
|
P54P_READ(ring_control_base);
|
||||||
|
wmb();
|
||||||
|
udelay(10);
|
||||||
|
|
||||||
|
P54P_WRITE(int_enable, cpu_to_le32(ISL38XX_INT_IDENT_INIT));
|
||||||
|
P54P_READ(int_enable);
|
||||||
|
wmb();
|
||||||
|
udelay(10);
|
||||||
|
|
||||||
|
P54P_WRITE(dev_int, cpu_to_le32(ISL38XX_DEV_INT_RESET));
|
||||||
|
P54P_READ(dev_int);
|
||||||
|
|
||||||
|
if (!wait_for_completion_interruptible_timeout(&priv->boot_comp, HZ)) {
|
||||||
|
printk(KERN_ERR "%s: Cannot boot firmware!\n",
|
||||||
|
wiphy_name(dev->wiphy));
|
||||||
|
p54p_stop(dev);
|
||||||
|
return -ETIMEDOUT;
|
||||||
|
}
|
||||||
|
|
||||||
|
P54P_WRITE(int_enable, cpu_to_le32(ISL38XX_INT_IDENT_UPDATE));
|
||||||
|
P54P_READ(int_enable);
|
||||||
|
wmb();
|
||||||
|
udelay(10);
|
||||||
|
|
||||||
|
P54P_WRITE(dev_int, cpu_to_le32(ISL38XX_DEV_INT_UPDATE));
|
||||||
|
P54P_READ(dev_int);
|
||||||
|
wmb();
|
||||||
|
udelay(10);
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
static int __devinit p54p_probe(struct pci_dev *pdev,
|
static int __devinit p54p_probe(struct pci_dev *pdev,
|
||||||
const struct pci_device_id *id)
|
const struct pci_device_id *id)
|
||||||
{
|
{
|
||||||
|
@ -556,11 +556,13 @@ static int __devinit p54p_probe(struct pci_dev *pdev,
|
||||||
spin_lock_init(&priv->lock);
|
spin_lock_init(&priv->lock);
|
||||||
tasklet_init(&priv->rx_tasklet, p54p_rx_tasklet, (unsigned long)dev);
|
tasklet_init(&priv->rx_tasklet, p54p_rx_tasklet, (unsigned long)dev);
|
||||||
|
|
||||||
p54p_open(dev);
|
err = p54p_open(dev);
|
||||||
|
if (err)
|
||||||
|
goto err_free_common;
|
||||||
err = p54_read_eeprom(dev);
|
err = p54_read_eeprom(dev);
|
||||||
p54p_stop(dev);
|
p54p_stop(dev);
|
||||||
if (err)
|
if (err)
|
||||||
goto err_free_desc;
|
goto err_free_common;
|
||||||
|
|
||||||
err = ieee80211_register_hw(dev);
|
err = ieee80211_register_hw(dev);
|
||||||
if (err) {
|
if (err) {
|
||||||
|
@ -573,8 +575,6 @@ static int __devinit p54p_probe(struct pci_dev *pdev,
|
||||||
|
|
||||||
err_free_common:
|
err_free_common:
|
||||||
p54_free_common(dev);
|
p54_free_common(dev);
|
||||||
|
|
||||||
err_free_desc:
|
|
||||||
pci_free_consistent(pdev, sizeof(*priv->ring_control),
|
pci_free_consistent(pdev, sizeof(*priv->ring_control),
|
||||||
priv->ring_control, priv->ring_control_dma);
|
priv->ring_control, priv->ring_control_dma);
|
||||||
|
|
||||||
|
|
|
@ -3025,7 +3025,7 @@ static inline void __qeth_fill_buffer(struct sk_buff *skb,
|
||||||
struct qdio_buffer *buffer, int is_tso, int *next_element_to_fill,
|
struct qdio_buffer *buffer, int is_tso, int *next_element_to_fill,
|
||||||
int offset)
|
int offset)
|
||||||
{
|
{
|
||||||
int length = skb->len - offset;
|
int length = skb->len;
|
||||||
int length_here;
|
int length_here;
|
||||||
int element;
|
int element;
|
||||||
char *data;
|
char *data;
|
||||||
|
@ -3037,6 +3037,7 @@ static inline void __qeth_fill_buffer(struct sk_buff *skb,
|
||||||
|
|
||||||
if (offset >= 0) {
|
if (offset >= 0) {
|
||||||
data = skb->data + offset;
|
data = skb->data + offset;
|
||||||
|
length -= offset;
|
||||||
first_lap = 0;
|
first_lap = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -373,8 +373,6 @@ static int qeth_l2_stop_card(struct qeth_card *card, int recovery_mode)
|
||||||
QETH_DBF_HEX(SETUP, 2, &card, sizeof(void *));
|
QETH_DBF_HEX(SETUP, 2, &card, sizeof(void *));
|
||||||
|
|
||||||
qeth_set_allowed_threads(card, 0, 1);
|
qeth_set_allowed_threads(card, 0, 1);
|
||||||
if (qeth_wait_for_threads(card, ~QETH_RECOVER_THREAD))
|
|
||||||
return -ERESTARTSYS;
|
|
||||||
if (card->read.state == CH_STATE_UP &&
|
if (card->read.state == CH_STATE_UP &&
|
||||||
card->write.state == CH_STATE_UP &&
|
card->write.state == CH_STATE_UP &&
|
||||||
(card->state == CARD_STATE_UP)) {
|
(card->state == CARD_STATE_UP)) {
|
||||||
|
@ -451,12 +449,15 @@ static void qeth_l2_process_inbound_buffer(struct qeth_card *card,
|
||||||
netif_rx(skb);
|
netif_rx(skb);
|
||||||
break;
|
break;
|
||||||
case QETH_HEADER_TYPE_OSN:
|
case QETH_HEADER_TYPE_OSN:
|
||||||
skb_push(skb, sizeof(struct qeth_hdr));
|
if (card->info.type == QETH_CARD_TYPE_OSN) {
|
||||||
skb_copy_to_linear_data(skb, hdr,
|
skb_push(skb, sizeof(struct qeth_hdr));
|
||||||
|
skb_copy_to_linear_data(skb, hdr,
|
||||||
sizeof(struct qeth_hdr));
|
sizeof(struct qeth_hdr));
|
||||||
len = skb->len;
|
len = skb->len;
|
||||||
card->osn_info.data_cb(skb);
|
card->osn_info.data_cb(skb);
|
||||||
break;
|
break;
|
||||||
|
}
|
||||||
|
/* else unknown */
|
||||||
default:
|
default:
|
||||||
dev_kfree_skb_any(skb);
|
dev_kfree_skb_any(skb);
|
||||||
QETH_DBF_TEXT(TRACE, 3, "inbunkno");
|
QETH_DBF_TEXT(TRACE, 3, "inbunkno");
|
||||||
|
@ -975,12 +976,6 @@ static int __qeth_l2_set_online(struct ccwgroup_device *gdev, int recovery_mode)
|
||||||
QETH_DBF_HEX(SETUP, 2, &card, sizeof(void *));
|
QETH_DBF_HEX(SETUP, 2, &card, sizeof(void *));
|
||||||
|
|
||||||
qeth_set_allowed_threads(card, QETH_RECOVER_THREAD, 1);
|
qeth_set_allowed_threads(card, QETH_RECOVER_THREAD, 1);
|
||||||
if (qeth_wait_for_threads(card, ~QETH_RECOVER_THREAD)) {
|
|
||||||
PRINT_WARN("set_online of card %s interrupted by user!\n",
|
|
||||||
CARD_BUS_ID(card));
|
|
||||||
return -ERESTARTSYS;
|
|
||||||
}
|
|
||||||
|
|
||||||
recover_flag = card->state;
|
recover_flag = card->state;
|
||||||
rc = ccw_device_set_online(CARD_RDEV(card));
|
rc = ccw_device_set_online(CARD_RDEV(card));
|
||||||
if (rc) {
|
if (rc) {
|
||||||
|
@ -1091,11 +1086,7 @@ static int __qeth_l2_set_offline(struct ccwgroup_device *cgdev,
|
||||||
if (card->dev && netif_carrier_ok(card->dev))
|
if (card->dev && netif_carrier_ok(card->dev))
|
||||||
netif_carrier_off(card->dev);
|
netif_carrier_off(card->dev);
|
||||||
recover_flag = card->state;
|
recover_flag = card->state;
|
||||||
if (qeth_l2_stop_card(card, recovery_mode) == -ERESTARTSYS) {
|
qeth_l2_stop_card(card, recovery_mode);
|
||||||
PRINT_WARN("Stopping card %s interrupted by user!\n",
|
|
||||||
CARD_BUS_ID(card));
|
|
||||||
return -ERESTARTSYS;
|
|
||||||
}
|
|
||||||
rc = ccw_device_set_offline(CARD_DDEV(card));
|
rc = ccw_device_set_offline(CARD_DDEV(card));
|
||||||
rc2 = ccw_device_set_offline(CARD_WDEV(card));
|
rc2 = ccw_device_set_offline(CARD_WDEV(card));
|
||||||
rc3 = ccw_device_set_offline(CARD_RDEV(card));
|
rc3 = ccw_device_set_offline(CARD_RDEV(card));
|
||||||
|
|
|
@ -2064,8 +2064,6 @@ static int qeth_l3_stop_card(struct qeth_card *card, int recovery_mode)
|
||||||
QETH_DBF_HEX(SETUP, 2, &card, sizeof(void *));
|
QETH_DBF_HEX(SETUP, 2, &card, sizeof(void *));
|
||||||
|
|
||||||
qeth_set_allowed_threads(card, 0, 1);
|
qeth_set_allowed_threads(card, 0, 1);
|
||||||
if (qeth_wait_for_threads(card, ~QETH_RECOVER_THREAD))
|
|
||||||
return -ERESTARTSYS;
|
|
||||||
if (card->read.state == CH_STATE_UP &&
|
if (card->read.state == CH_STATE_UP &&
|
||||||
card->write.state == CH_STATE_UP &&
|
card->write.state == CH_STATE_UP &&
|
||||||
(card->state == CARD_STATE_UP)) {
|
(card->state == CARD_STATE_UP)) {
|
||||||
|
@ -3049,11 +3047,6 @@ static int __qeth_l3_set_online(struct ccwgroup_device *gdev, int recovery_mode)
|
||||||
QETH_DBF_HEX(SETUP, 2, &card, sizeof(void *));
|
QETH_DBF_HEX(SETUP, 2, &card, sizeof(void *));
|
||||||
|
|
||||||
qeth_set_allowed_threads(card, QETH_RECOVER_THREAD, 1);
|
qeth_set_allowed_threads(card, QETH_RECOVER_THREAD, 1);
|
||||||
if (qeth_wait_for_threads(card, ~QETH_RECOVER_THREAD)) {
|
|
||||||
PRINT_WARN("set_online of card %s interrupted by user!\n",
|
|
||||||
CARD_BUS_ID(card));
|
|
||||||
return -ERESTARTSYS;
|
|
||||||
}
|
|
||||||
|
|
||||||
recover_flag = card->state;
|
recover_flag = card->state;
|
||||||
rc = ccw_device_set_online(CARD_RDEV(card));
|
rc = ccw_device_set_online(CARD_RDEV(card));
|
||||||
|
@ -3170,11 +3163,7 @@ static int __qeth_l3_set_offline(struct ccwgroup_device *cgdev,
|
||||||
if (card->dev && netif_carrier_ok(card->dev))
|
if (card->dev && netif_carrier_ok(card->dev))
|
||||||
netif_carrier_off(card->dev);
|
netif_carrier_off(card->dev);
|
||||||
recover_flag = card->state;
|
recover_flag = card->state;
|
||||||
if (qeth_l3_stop_card(card, recovery_mode) == -ERESTARTSYS) {
|
qeth_l3_stop_card(card, recovery_mode);
|
||||||
PRINT_WARN("Stopping card %s interrupted by user!\n",
|
|
||||||
CARD_BUS_ID(card));
|
|
||||||
return -ERESTARTSYS;
|
|
||||||
}
|
|
||||||
rc = ccw_device_set_offline(CARD_DDEV(card));
|
rc = ccw_device_set_offline(CARD_DDEV(card));
|
||||||
rc2 = ccw_device_set_offline(CARD_WDEV(card));
|
rc2 = ccw_device_set_offline(CARD_WDEV(card));
|
||||||
rc3 = ccw_device_set_offline(CARD_RDEV(card));
|
rc3 = ccw_device_set_offline(CARD_RDEV(card));
|
||||||
|
|
|
@ -121,9 +121,6 @@ static ssize_t qeth_l3_dev_route6_show(struct device *dev,
|
||||||
if (!card)
|
if (!card)
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
if (!qeth_is_supported(card, IPA_IPV6))
|
|
||||||
return sprintf(buf, "%s\n", "n/a");
|
|
||||||
|
|
||||||
return qeth_l3_dev_route_show(card, &card->options.route6, buf);
|
return qeth_l3_dev_route_show(card, &card->options.route6, buf);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -135,10 +132,6 @@ static ssize_t qeth_l3_dev_route6_store(struct device *dev,
|
||||||
if (!card)
|
if (!card)
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
if (!qeth_is_supported(card, IPA_IPV6)) {
|
|
||||||
return -EOPNOTSUPP;
|
|
||||||
}
|
|
||||||
|
|
||||||
return qeth_l3_dev_route_store(card, &card->options.route6,
|
return qeth_l3_dev_route_store(card, &card->options.route6,
|
||||||
QETH_PROT_IPV6, buf, count);
|
QETH_PROT_IPV6, buf, count);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1474,7 +1474,6 @@ void ieee80211_tx_status_irqsafe(struct ieee80211_hw *hw,
|
||||||
* ieee80211_beacon_get - beacon generation function
|
* ieee80211_beacon_get - beacon generation function
|
||||||
* @hw: pointer obtained from ieee80211_alloc_hw().
|
* @hw: pointer obtained from ieee80211_alloc_hw().
|
||||||
* @vif: &struct ieee80211_vif pointer from &struct ieee80211_if_init_conf.
|
* @vif: &struct ieee80211_vif pointer from &struct ieee80211_if_init_conf.
|
||||||
* @control: will be filled with information needed to send this beacon.
|
|
||||||
*
|
*
|
||||||
* If the beacon frames are generated by the host system (i.e., not in
|
* If the beacon frames are generated by the host system (i.e., not in
|
||||||
* hardware/firmware), the low-level driver uses this function to receive
|
* hardware/firmware), the low-level driver uses this function to receive
|
||||||
|
@ -1575,7 +1574,6 @@ __le16 ieee80211_generic_frame_duration(struct ieee80211_hw *hw,
|
||||||
* ieee80211_get_buffered_bc - accessing buffered broadcast and multicast frames
|
* ieee80211_get_buffered_bc - accessing buffered broadcast and multicast frames
|
||||||
* @hw: pointer as obtained from ieee80211_alloc_hw().
|
* @hw: pointer as obtained from ieee80211_alloc_hw().
|
||||||
* @vif: &struct ieee80211_vif pointer from &struct ieee80211_if_init_conf.
|
* @vif: &struct ieee80211_vif pointer from &struct ieee80211_if_init_conf.
|
||||||
* @control: will be filled with information needed to send returned frame.
|
|
||||||
*
|
*
|
||||||
* Function for accessing buffered broadcast and multicast frames. If
|
* Function for accessing buffered broadcast and multicast frames. If
|
||||||
* hardware/firmware does not implement buffering of broadcast/multicast
|
* hardware/firmware does not implement buffering of broadcast/multicast
|
||||||
|
@ -1623,9 +1621,8 @@ unsigned int ieee80211_hdrlen(__le16 fc);
|
||||||
*
|
*
|
||||||
* @keyconf: the parameter passed with the set key
|
* @keyconf: the parameter passed with the set key
|
||||||
* @skb: the skb for which the key is needed
|
* @skb: the skb for which the key is needed
|
||||||
* @rc4key: a buffer to which the key will be written
|
|
||||||
* @type: TBD
|
* @type: TBD
|
||||||
* @key: TBD
|
* @key: a buffer to which the key will be written
|
||||||
*/
|
*/
|
||||||
void ieee80211_get_tkip_key(struct ieee80211_key_conf *keyconf,
|
void ieee80211_get_tkip_key(struct ieee80211_key_conf *keyconf,
|
||||||
struct sk_buff *skb,
|
struct sk_buff *skb,
|
||||||
|
@ -1726,7 +1723,8 @@ void ieee80211_iterate_active_interfaces_atomic(struct ieee80211_hw *hw,
|
||||||
* @hw: pointer as obtained from ieee80211_alloc_hw().
|
* @hw: pointer as obtained from ieee80211_alloc_hw().
|
||||||
* @ra: receiver address of the BA session recipient
|
* @ra: receiver address of the BA session recipient
|
||||||
* @tid: the TID to BA on.
|
* @tid: the TID to BA on.
|
||||||
* @return: success if addBA request was sent, failure otherwise
|
*
|
||||||
|
* Return: success if addBA request was sent, failure otherwise
|
||||||
*
|
*
|
||||||
* Although mac80211/low level driver/user space application can estimate
|
* Although mac80211/low level driver/user space application can estimate
|
||||||
* the need to start aggregation on a certain RA/TID, the session level
|
* the need to start aggregation on a certain RA/TID, the session level
|
||||||
|
@ -1764,7 +1762,8 @@ void ieee80211_start_tx_ba_cb_irqsafe(struct ieee80211_hw *hw, const u8 *ra,
|
||||||
* @ra: receiver address of the BA session recipient
|
* @ra: receiver address of the BA session recipient
|
||||||
* @tid: the TID to stop BA.
|
* @tid: the TID to stop BA.
|
||||||
* @initiator: if indicates initiator DELBA frame will be sent.
|
* @initiator: if indicates initiator DELBA frame will be sent.
|
||||||
* @return: error if no sta with matching da found, success otherwise
|
*
|
||||||
|
* Return: error if no sta with matching da found, success otherwise
|
||||||
*
|
*
|
||||||
* Although mac80211/low level driver/user space application can estimate
|
* Although mac80211/low level driver/user space application can estimate
|
||||||
* the need to stop aggregation on a certain RA/TID, the session level
|
* the need to stop aggregation on a certain RA/TID, the session level
|
||||||
|
|
|
@ -1973,28 +1973,27 @@ static void pktgen_setup_inject(struct pktgen_dev *pkt_dev)
|
||||||
|
|
||||||
/* make sure that we don't pick a non-existing transmit queue */
|
/* make sure that we don't pick a non-existing transmit queue */
|
||||||
ntxq = pkt_dev->odev->real_num_tx_queues;
|
ntxq = pkt_dev->odev->real_num_tx_queues;
|
||||||
if (ntxq <= num_online_cpus() && (pkt_dev->flags & F_QUEUE_MAP_CPU)) {
|
if (ntxq > num_online_cpus() && (pkt_dev->flags & F_QUEUE_MAP_CPU)) {
|
||||||
printk(KERN_WARNING "pktgen: WARNING: QUEUE_MAP_CPU "
|
printk(KERN_WARNING "pktgen: WARNING: QUEUE_MAP_CPU "
|
||||||
"disabled because CPU count (%d) exceeds number ",
|
"disabled because CPU count (%d) exceeds number "
|
||||||
num_online_cpus());
|
"of tx queues (%d) on %s\n", num_online_cpus(), ntxq,
|
||||||
printk(KERN_WARNING "pktgen: WARNING: of tx queues "
|
pkt_dev->odev->name);
|
||||||
"(%d) on %s \n", ntxq, pkt_dev->odev->name);
|
|
||||||
pkt_dev->flags &= ~F_QUEUE_MAP_CPU;
|
pkt_dev->flags &= ~F_QUEUE_MAP_CPU;
|
||||||
}
|
}
|
||||||
if (ntxq <= pkt_dev->queue_map_min) {
|
if (ntxq <= pkt_dev->queue_map_min) {
|
||||||
printk(KERN_WARNING "pktgen: WARNING: Requested "
|
printk(KERN_WARNING "pktgen: WARNING: Requested "
|
||||||
"queue_map_min (%d) exceeds number of tx\n",
|
"queue_map_min (zero-based) (%d) exceeds valid range "
|
||||||
pkt_dev->queue_map_min);
|
"[0 - %d] for (%d) queues on %s, resetting\n",
|
||||||
printk(KERN_WARNING "pktgen: WARNING: queues (%d) on "
|
pkt_dev->queue_map_min, (ntxq ?: 1)- 1, ntxq,
|
||||||
"%s, resetting\n", ntxq, pkt_dev->odev->name);
|
pkt_dev->odev->name);
|
||||||
pkt_dev->queue_map_min = ntxq - 1;
|
pkt_dev->queue_map_min = ntxq - 1;
|
||||||
}
|
}
|
||||||
if (ntxq <= pkt_dev->queue_map_max) {
|
if (pkt_dev->queue_map_max >= ntxq) {
|
||||||
printk(KERN_WARNING "pktgen: WARNING: Requested "
|
printk(KERN_WARNING "pktgen: WARNING: Requested "
|
||||||
"queue_map_max (%d) exceeds number of tx\n",
|
"queue_map_max (zero-based) (%d) exceeds valid range "
|
||||||
pkt_dev->queue_map_max);
|
"[0 - %d] for (%d) queues on %s, resetting\n",
|
||||||
printk(KERN_WARNING "pktgen: WARNING: queues (%d) on "
|
pkt_dev->queue_map_max, (ntxq ?: 1)- 1, ntxq,
|
||||||
"%s, resetting\n", ntxq, pkt_dev->odev->name);
|
pkt_dev->odev->name);
|
||||||
pkt_dev->queue_map_max = ntxq - 1;
|
pkt_dev->queue_map_max = ntxq - 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -94,8 +94,8 @@ minstrel_stats_open(struct inode *inode, struct file *file)
|
||||||
prob / 10, prob % 10,
|
prob / 10, prob % 10,
|
||||||
mr->last_success,
|
mr->last_success,
|
||||||
mr->last_attempts,
|
mr->last_attempts,
|
||||||
mr->succ_hist,
|
(unsigned long long)mr->succ_hist,
|
||||||
mr->att_hist);
|
(unsigned long long)mr->att_hist);
|
||||||
}
|
}
|
||||||
p += sprintf(p, "\nTotal packet count:: ideal %d "
|
p += sprintf(p, "\nTotal packet count:: ideal %d "
|
||||||
"lookaround %d\n\n",
|
"lookaround %d\n\n",
|
||||||
|
@ -106,7 +106,7 @@ minstrel_stats_open(struct inode *inode, struct file *file)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static ssize_t
|
||||||
minstrel_stats_read(struct file *file, char __user *buf, size_t len, loff_t *o)
|
minstrel_stats_read(struct file *file, char __user *buf, size_t len, loff_t *o)
|
||||||
{
|
{
|
||||||
struct minstrel_stats_info *ms;
|
struct minstrel_stats_info *ms;
|
||||||
|
|
|
@ -256,6 +256,11 @@ static struct input_handler rfkill_handler = {
|
||||||
|
|
||||||
static int __init rfkill_handler_init(void)
|
static int __init rfkill_handler_init(void)
|
||||||
{
|
{
|
||||||
|
unsigned long last_run = jiffies - msecs_to_jiffies(500);
|
||||||
|
rfkill_wlan.last = last_run;
|
||||||
|
rfkill_bt.last = last_run;
|
||||||
|
rfkill_uwb.last = last_run;
|
||||||
|
rfkill_wimax.last = last_run;
|
||||||
return input_register_handler(&rfkill_handler);
|
return input_register_handler(&rfkill_handler);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue