diff options
author | James Bottomley <jejb@titanic.(none)> | 2005-05-20 20:27:44 (GMT) |
---|---|---|
committer | James Bottomley <jejb@titanic.(none)> | 2005-05-20 20:27:44 (GMT) |
commit | ad34ea2cc3845ef4dcd7d12fb0fa8484734bd672 (patch) | |
tree | ad434400f5ecaa33b433c8f830e40792d8d6c05c /Documentation/networking | |
parent | 90356ac3194bf91a441a5f9c3067af386ef62462 (diff) | |
parent | 88d7bd8cb9eb8d64bf7997600b0d64f7834047c5 (diff) | |
download | linux-fsl-qoriq-ad34ea2cc3845ef4dcd7d12fb0fa8484734bd672.tar.xz |
merge by hand - fix up rejections in Documentation/DocBook/Makefile
Diffstat (limited to 'Documentation/networking')
-rw-r--r-- | Documentation/networking/DLINK.txt | 7 | ||||
-rw-r--r-- | Documentation/networking/netdevices.txt | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/Documentation/networking/DLINK.txt b/Documentation/networking/DLINK.txt index 083d247..55d2443 100644 --- a/Documentation/networking/DLINK.txt +++ b/Documentation/networking/DLINK.txt @@ -178,10 +178,9 @@ Released 1994-06-13 7. ACKNOWLEDGMENTS. These drivers wouldn't have been done without the base - (and support) from Ross Biro <bir7@leland.stanford.edu>, - and D-Link Systems Inc. The driver relies upon GPL-ed - source from D-Link Systems Inc. and from Russel Nelson at - Crynwr Software <nelson@crynwr.com>. + (and support) from Ross Biro, and D-Link Systems Inc. + The driver relies upon GPL-ed source from D-Link Systems Inc. + and from Russel Nelson at Crynwr Software <nelson@crynwr.com>. Additional input also from: Donald Becker <becker@super.org>, Alan Cox <A.Cox@swansea.ac.uk> diff --git a/Documentation/networking/netdevices.txt b/Documentation/networking/netdevices.txt index 1509f3a..3c0a5ba 100644 --- a/Documentation/networking/netdevices.txt +++ b/Documentation/networking/netdevices.txt @@ -51,6 +51,8 @@ dev->hard_start_xmit: set_multicast_list Context: BHs disabled Notes: netif_queue_stopped() is guaranteed false + Interrupts must be enabled when calling hard_start_xmit. + (Interrupts must also be enabled when enabling the BH handler.) Return codes: o NETDEV_TX_OK everything ok. o NETDEV_TX_BUSY Cannot transmit packet, try later |