← Back to branch summary

~ubuntu-branches/debian/wheezy/linux-2.6/wheezy

« back to all changes in this revision

Viewing changes to drivers/net/wireless/iwlwifi/iwl-eeprom.c

  • Committer: Bazaar Package Importer
  • Author(s): Ben Hutchings, Ben Hutchings, Aurelien Jarno
  • Date: 2011-06-07 12:14:05 UTC
  • mfrom: (43.1.9 sid)
  • Revision ID: james.westby@ubuntu.com-20110607121405-i3h1rd7nrnd2b73h
Tags: 2.6.39-2
http://bugs.debian.org/627492
http://bugs.debian.org/596626
http://bugs.debian.org/628932
http://bugs.debian.org/628191
http://bugs.debian.org/627837
http://bugs.debian.org/622997
http://bugs.debian.org/622745
http://bugs.debian.org/619827
http://bugs.debian.org/629401
[ Ben Hutchings ]
* [x86] Enable BACKLIGHT_APPLE, replacing BACKLIGHT_MBP_NVIDIA
  (Closes: #627492)
* cgroups: Disable memory resource controller by default. Allow it
  to be enabled using kernel parameter 'cgroup_enable=memory'.
* rt2800usb: Enable support for more USB devices including
  Linksys WUSB600N (Closes: #596626) (this change was accidentally
  omitted from 2.6.39-1)
* [x86] Remove Celeron from list of processors supporting PAE. Most
  'Celeron M' models do not.
* Update debconf template translations:
  - Swedish (Martin Bagge) (Closes: #628932)
  - French (David Prévot) (Closes: #628191)
* aufs: Update for 2.6.39 (Closes: #627837)
* Add stable 2.6.39.1, including:
  - ext4: dont set PageUptodate in ext4_end_bio()
  - pata_cmd64x: fix boot crash on parisc (Closes: #622997, #622745)
  - ext3: Fix fs corruption when make_indexed_dir() fails
  - netfilter: nf_ct_sip: validate Content-Length in TCP SIP messages
  - sctp: fix race between sctp_bind_addr_free() and
    sctp_bind_addr_conflict()
  - sctp: fix memory leak of the ASCONF queue when free asoc
  - md/bitmap: fix saving of events_cleared and other state
  - cdc_acm: Fix oops when Droids MuIn LCD is connected
  - cx88: Fix conversion from BKL to fine-grained locks (Closes: #619827)
  - keys: Set cred->user_ns in key_replace_session_keyring (CVE-2011-2184)
  - tmpfs: fix race between truncate and writepage
  - nfs41: Correct offset for LAYOUTCOMMIT
  - xen/mmu: fix a race window causing leave_mm BUG()
  - ext4: fix possible use-after-free in ext4_remove_li_request()
  For the complete list of changes, see:
   http://www.kernel.org/pub/linux/kernel/v2.6/ChangeLog-2.6.39.1
* Bump ABI to 2
* netfilter: Enable IP_SET, IP_SET_BITMAP_IP, IP_SET_BITMAP_IPMAC,
  IP_SET_BITMAP_PORT, IP_SET_HASH_IP, IP_SET_HASH_IPPORT,
  IP_SET_HASH_IPPORTIP, IP_SET_HASH_IPPORTNET, IP_SET_HASH_NET,
  IP_SET_HASH_NETPORT, IP_SET_LIST_SET, NETFILTER_XT_SET as modules
  (Closes: #629401)

[ Aurelien Jarno ]
* [mipsel/loongson-2f] Disable_SCSI_LPFC to workaround GCC ICE.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/net/wireless/iwlwifi/iwl-eeprom.c
222
222
        BUG_ON(offset >= priv->cfg->base_params->eeprom_size);
223
223
        return &priv->eeprom[offset];
224
224
}
225
 
EXPORT_SYMBOL(iwlcore_eeprom_query_addr);
226
225
 
227
226
static int iwl_init_otp_access(struct iwl_priv *priv)
228
227
{
382
381
{
383
382
        return priv->cfg->ops->lib->eeprom_ops.query_addr(priv, offset);
384
383
}
385
 
EXPORT_SYMBOL(iwl_eeprom_query_addr);
386
384
 
387
385
u16 iwl_eeprom_query16(const struct iwl_priv *priv, size_t offset)
388
386
{
390
388
                return 0;
391
389
        return (u16)priv->eeprom[offset] | ((u16)priv->eeprom[offset + 1] << 8);
392
390
}
393
 
EXPORT_SYMBOL(iwl_eeprom_query16);
394
391
 
395
392
/**
396
393
 * iwl_eeprom_init - read EEPROM contents
509
506
alloc_err:
510
507
        return ret;
511
508
}
512
 
EXPORT_SYMBOL(iwl_eeprom_init);
513
509
 
514
510
void iwl_eeprom_free(struct iwl_priv *priv)
515
511
{
516
512
        kfree(priv->eeprom);
517
513
        priv->eeprom = NULL;
518
514
}
519
 
EXPORT_SYMBOL(iwl_eeprom_free);
520
515
 
521
516
static void iwl_init_band_reference(const struct iwl_priv *priv,
522
517
                        int eep_band, int *eeprom_ch_count,
779
774
 
780
775
        return 0;
781
776
}
782
 
EXPORT_SYMBOL(iwl_init_channel_map);
783
777
 
784
778
/*
785
779
 * iwl_free_channel_map - undo allocations in iwl_init_channel_map
789
783
        kfree(priv->channel_info);
790
784
        priv->channel_count = 0;
791
785
}
792
 
EXPORT_SYMBOL(iwl_free_channel_map);
793
786
 
794
787
/**
795
788
 * iwl_get_channel_info - Find driver's private channel info
818
811
 
819
812
        return NULL;
820
813
}
821
 
EXPORT_SYMBOL(iwl_get_channel_info);