diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-30 11:41:36 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-30 11:41:36 -0500 |
| commit | dbeb17016e4d0affccfa07f4e8f61feac75c5a18 (patch) | |
| tree | 0cbda9fb039cb96d7c76cce19e1f792d46cd2a3c /Documentation | |
| parent | 0461ec5bc7745b89a8ab67ba0ea497abd58a6301 (diff) | |
| parent | f99ec0649accb581cf3e8fcfeea796e82d05f4ea (diff) | |
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: (29 commits)
tulip: fix 21142 with 10Mbps without negotiation
drivers/net/skfp: if !capable(CAP_NET_ADMIN): inverted logic
gianfar: Fix Wake-on-LAN support
smsc911x: timeout reaches -1
smsc9420: fix interrupt signalling test failures
ucc_geth: Change uec phy id to the same format as gianfar's
wimax: fix build issue when debugfs is disabled
netxen: fix memory leak in drivers/net/netxen_nic_init.c
tun: Add some missing TUN compat ioctl translations.
ipv4: fix infinite retry loop in IP-Config
net: update documentation ip aliases
net: Fix OOPS in skb_seq_read().
net: Fix frag_list handling in skb_seq_read
netxen: revert jumbo ringsize
ath5k: fix locking in ath5k_config
cfg80211: print correct intersected regulatory domain
cfg80211: Fix sanity check on 5 GHz when processing country IE
iwlwifi: fix kernel oops when ucode DMA memory allocation failure
rtl8187: Fix error in setting OFDM power settings for RTL8187L
mac80211: remove Michael Wu as maintainer
...
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/networking/alias.txt | 25 |
1 files changed, 6 insertions, 19 deletions
diff --git a/Documentation/networking/alias.txt b/Documentation/networking/alias.txt index cd12c2ff518a..85046f53fcfc 100644 --- a/Documentation/networking/alias.txt +++ b/Documentation/networking/alias.txt | |||
| @@ -2,13 +2,13 @@ | |||
| 2 | IP-Aliasing: | 2 | IP-Aliasing: |
| 3 | ============ | 3 | ============ |
| 4 | 4 | ||
| 5 | IP-aliases are additional IP-addresses/masks hooked up to a base | 5 | IP-aliases are an obsolete way to manage multiple IP-addresses/masks |
| 6 | interface by adding a colon and a string when running ifconfig. | 6 | per interface. Newer tools such as iproute2 support multiple |
| 7 | This string is usually numeric, but this is not a must. | 7 | address/prefixes per interface, but aliases are still supported |
| 8 | 8 | for backwards compatibility. | |
| 9 | IP-Aliases are avail if CONFIG_INET (`standard' IPv4 networking) | ||
| 10 | is configured in the kernel. | ||
| 11 | 9 | ||
| 10 | An alias is formed by adding a colon and a string when running ifconfig. | ||
| 11 | This string is usually numeric, but this is not a must. | ||
| 12 | 12 | ||
| 13 | o Alias creation. | 13 | o Alias creation. |
| 14 | Alias creation is done by 'magic' interface naming: eg. to create a | 14 | Alias creation is done by 'magic' interface naming: eg. to create a |
| @@ -38,16 +38,3 @@ o Relationship with main device | |||
| 38 | 38 | ||
| 39 | If the base device is shut down the added aliases will be deleted | 39 | If the base device is shut down the added aliases will be deleted |
| 40 | too. | 40 | too. |
| 41 | |||
| 42 | |||
| 43 | Contact | ||
| 44 | ------- | ||
| 45 | Please finger or e-mail me: | ||
| 46 | Juan Jose Ciarlante <jjciarla@raiz.uncu.edu.ar> | ||
| 47 | |||
| 48 | Updated by Erik Schoenfelder <schoenfr@gaertner.DE> | ||
| 49 | |||
| 50 | ; local variables: | ||
| 51 | ; mode: indented-text | ||
| 52 | ; mode: auto-fill | ||
| 53 | ; end: | ||