Commit 2f819ae8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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: (45 commits)
  [VLAN]: Proc entry is not renamed when vlan device name changes.
  [IPV6]: Fix ICMP relookup error path dst leak
  [ATM] drivers/atm/iphase.c: compilation warning fix
  IPv6: do not create temporary adresses with too short preferred lifetime
  IPv6: only update the lifetime of the relevant temporary address
  bluetooth : __rfcomm_dlc_close lock fix
  bluetooth : use lockdep sub-classes for diffrent bluetooth protocol
  [ROSE/AX25] af_rose: rose_release() fix
  mac80211: correct use_short_preamble handling
  b43: Fix PCMCIA IRQ routing
  b43: Add DMA mapping failure messages
  mac80211: trigger ieee80211_sta_work after opening interface
  [LLC]: skb allocation size for responses
  [IP] UDP: Use SEQ_START_TOKEN.
  [NET]: Remove Documentation/networking/sk98lin.txt
  [ATM] atm/idt77252.c: Make 2 functions static
  [ATM]: Make atm/he.c:read_prom_byte() static
  [IPV6] MCAST: Ensure to check multicast listener(s).
  [LLC]: Kill llc_station_mac_sa symbol export.
  forcedeth: fix locking bug with netconsole
  ...
parents d40c2f29 802fb176

Documentation/networking/00-INDEX

+0 −3
Original line number Diff line number Diff line
@@ -84,9 +84,6 @@ policy-routing.txt 
	- IP policy-based routing

ray_cs.txt

	- Raylink Wireless LAN card driver info.

sk98lin.txt

	- Marvell Yukon Chipset / SysKonnect SK-98xx compliant Gigabit

	  Ethernet Adapter family driver info

skfp.txt

	- SysKonnect FDDI (SK-5xxx, Compaq Netelligent) driver info.

smc9.txt

Documentation/networking/sk98lin.txt

deleted100644 → 0
+0 −568

File deleted.

Preview size limit exceeded, changes collapsed.

drivers/atm/firestream.c

+1 −0
Original line number Diff line number Diff line
@@ -978,6 +978,7 @@ static int fs_open(struct atm_vcc *atm_vcc) 
		/* Docs are vague about this atm_hdr field. By the way, the FS

		 * chip makes odd errors if lower bits are set.... -- REW */

		tc->atm_hdr =  (vpi << 20) | (vci << 4); 

		tmc0 = 0;

		{

			int pcr = atm_pcr_goal (txtp);

drivers/atm/he.c

+1 −2
Original line number Diff line number Diff line
@@ -3000,8 +3000,7 @@ he_proc_read(struct atm_dev *dev, loff_t *pos, char *page) 


/* eeprom routines  -- see 4.7 */



u8

read_prom_byte(struct he_dev *he_dev, int addr)

static u8 read_prom_byte(struct he_dev *he_dev, int addr)

{

	u32 val = 0, tmp_read = 0;

	int i, j = 0;

drivers/atm/idt77252.c

+2 −4
Original line number Diff line number Diff line
@@ -2016,8 +2016,7 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam) 
	return 0;

}



int

idt77252_send(struct atm_vcc *vcc, struct sk_buff *skb)

static int idt77252_send(struct atm_vcc *vcc, struct sk_buff *skb)

{

	return idt77252_send_skb(vcc, skb, 0);

}
@@ -3072,8 +3071,7 @@ idt77252_dev_open(struct idt77252_dev *card) 
	return 0;

}



void

idt77252_dev_close(struct atm_dev *dev)

static void idt77252_dev_close(struct atm_dev *dev)

{

	struct idt77252_dev *card = dev->dev_data;

	u32 conf;

CRA Git | Maintained and supported by SUSTech CRA and CCSE