diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-01-18 17:06:44 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-01-18 17:06:44 -0500 |
| commit | 8b2d1833a29e9dc8bccad348396ad08666379d77 (patch) | |
| tree | a7bb3bb922bb744934cc0d0bcce043ad8129ab0e /Documentation | |
| parent | c9daa2722a3f1967e3e9750fd4cb6a7352a3cd63 (diff) | |
| parent | ba596a01886b236c8171fc28d53842da0128224e (diff) | |
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (31 commits)
Replace cpmac fix
dl2k: the rest
dl2k: MSCR, MSSR, ESR, PHY_SCR fixes
dl2k: BMSR fixes
dl2k: ANAR, ANLPAR fixes
dl2k: BMCR_t fixes
3c574, 3c515 bitfields abuse
sbni endian fixes
wan/lmc bitfields fixes
dscc4 endian fixes
S2io: Fixed synchronization between scheduling of napi with card reset and close
atl1: fix frame length bug
Documentation: add a guideline for hard_start_xmit method
Revert "sky2: remove check for PCI wakeup setting from BIOS"
e1000e Kconfig: remove ref to nonexistant docs
bonding: Don't hold lock when calling rtnl_unlock
bonding: fix lock ordering for rtnl and bonding_rwsem
bonding: Fix up parameter parsing
bonding: release slaves when master removed via sysfs
bonding: fix locking during alb failover and slave removal
...
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/networking/driver.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Documentation/networking/driver.txt b/Documentation/networking/driver.txt index 4f7da5a2bf4f..ea72d2e66ca8 100644 --- a/Documentation/networking/driver.txt +++ b/Documentation/networking/driver.txt | |||
| @@ -61,7 +61,10 @@ Transmit path guidelines: | |||
| 61 | 2) Do not forget to update netdev->trans_start to jiffies after | 61 | 2) Do not forget to update netdev->trans_start to jiffies after |
| 62 | each new tx packet is given to the hardware. | 62 | each new tx packet is given to the hardware. |
| 63 | 63 | ||
| 64 | 3) Do not forget that once you return 0 from your hard_start_xmit | 64 | 3) A hard_start_xmit method must not modify the shared parts of a |
| 65 | cloned SKB. | ||
| 66 | |||
| 67 | 4) Do not forget that once you return 0 from your hard_start_xmit | ||
| 65 | method, it is your driver's responsibility to free up the SKB | 68 | method, it is your driver's responsibility to free up the SKB |
| 66 | and in some finite amount of time. | 69 | and in some finite amount of time. |
| 67 | 70 | ||