diff options
| author | David S. Miller <davem@davemloft.net> | 2012-11-25 12:49:17 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-11-25 12:49:17 -0500 |
| commit | 24bc518a6888e4c97add5a5ebbff11c1ccac219f (patch) | |
| tree | d125270f4e8432cebcbc8af9079dece51dd798a0 /Documentation/networking | |
| parent | b3e3bd71b429c04490d6a57671f2bbe2121d4f5a (diff) | |
| parent | 194d9831f0419b5125dc94ec0ece4434d8ef74f0 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/wireless/iwlwifi/pcie/tx.c
Minor iwlwifi conflict in TX queue disabling between 'net', which
removed a bogus warning, and 'net-next' which added some status
register poking code.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'Documentation/networking')
| -rw-r--r-- | Documentation/networking/vxlan.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/networking/vxlan.txt b/Documentation/networking/vxlan.txt index 5b34b762d7d5..6d993510f091 100644 --- a/Documentation/networking/vxlan.txt +++ b/Documentation/networking/vxlan.txt | |||
| @@ -32,7 +32,7 @@ no entry is in the forwarding table. | |||
| 32 | # ip link delete vxlan0 | 32 | # ip link delete vxlan0 |
| 33 | 33 | ||
| 34 | 3. Show vxlan info | 34 | 3. Show vxlan info |
| 35 | # ip -d show vxlan0 | 35 | # ip -d link show vxlan0 |
| 36 | 36 | ||
| 37 | It is possible to create, destroy and display the vxlan | 37 | It is possible to create, destroy and display the vxlan |
| 38 | forwarding table using the new bridge command. | 38 | forwarding table using the new bridge command. |
| @@ -41,7 +41,7 @@ forwarding table using the new bridge command. | |||
| 41 | # bridge fdb add to 00:17:42:8a:b4:05 dst 192.19.0.2 dev vxlan0 | 41 | # bridge fdb add to 00:17:42:8a:b4:05 dst 192.19.0.2 dev vxlan0 |
| 42 | 42 | ||
| 43 | 2. Delete forwarding table entry | 43 | 2. Delete forwarding table entry |
| 44 | # bridge fdb delete 00:17:42:8a:b4:05 | 44 | # bridge fdb delete 00:17:42:8a:b4:05 dev vxlan0 |
| 45 | 45 | ||
| 46 | 3. Show forwarding table | 46 | 3. Show forwarding table |
| 47 | # bridge fdb show dev vxlan0 | 47 | # bridge fdb show dev vxlan0 |