diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-01-29 06:54:01 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-01-29 06:54:01 -0500 |
commit | 0ba6c33bcddc64a54b5f1c25a696c4767dc76292 (patch) | |
tree | 62e616f97a4762d8e75bf732e4827af2d15d52c5 /arch/ppc | |
parent | 21af0297c7e56024a5ccc4d8ad2a590f9ec371ba (diff) | |
parent | 85040bcb4643cba578839e953f25e2d1965d83d0 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.25
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.25: (1470 commits)
[IPV6] ADDRLABEL: Fix double free on label deletion.
[PPP]: Sparse warning fixes.
[IPV4] fib_trie: remove unneeded NULL check
[IPV4] fib_trie: More whitespace cleanup.
[NET_SCHED]: Use nla_policy for attribute validation in ematches
[NET_SCHED]: Use nla_policy for attribute validation in actions
[NET_SCHED]: Use nla_policy for attribute validation in classifiers
[NET_SCHED]: Use nla_policy for attribute validation in packet schedulers
[NET_SCHED]: sch_api: introduce constant for rate table size
[NET_SCHED]: Use typeful attribute parsing helpers
[NET_SCHED]: Use typeful attribute construction helpers
[NET_SCHED]: Use NLA_PUT_STRING for string dumping
[NET_SCHED]: Use nla_nest_start/nla_nest_end
[NET_SCHED]: Propagate nla_parse return value
[NET_SCHED]: act_api: use PTR_ERR in tcf_action_init/tcf_action_get
[NET_SCHED]: act_api: use nlmsg_parse
[NET_SCHED]: act_api: fix netlink API conversion bug
[NET_SCHED]: sch_netem: use nla_parse_nested_compat
[NET_SCHED]: sch_atm: fix format string warning
[NETNS]: Add namespace for ICMP replying code.
...
Diffstat (limited to 'arch/ppc')
-rw-r--r-- | arch/ppc/8260_io/enet.c | 4 | ||||
-rw-r--r-- | arch/ppc/8260_io/fcc_enet.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/ppc/8260_io/enet.c b/arch/ppc/8260_io/enet.c index 615b6583d9b..06bb5b77ea6 100644 --- a/arch/ppc/8260_io/enet.c +++ b/arch/ppc/8260_io/enet.c | |||
@@ -272,7 +272,7 @@ scc_enet_timeout(struct net_device *dev) | |||
272 | * This is called from the CPM handler, not the MPC core interrupt. | 272 | * This is called from the CPM handler, not the MPC core interrupt. |
273 | */ | 273 | */ |
274 | static irqreturn_t | 274 | static irqreturn_t |
275 | scc_enet_interrupt(int irq, void * dev_id) | 275 | scc_enet_interrupt(int irq, void *dev_id) |
276 | { | 276 | { |
277 | struct net_device *dev = dev_id; | 277 | struct net_device *dev = dev_id; |
278 | volatile struct scc_enet_private *cep; | 278 | volatile struct scc_enet_private *cep; |
@@ -280,7 +280,7 @@ scc_enet_interrupt(int irq, void * dev_id) | |||
280 | ushort int_events; | 280 | ushort int_events; |
281 | int must_restart; | 281 | int must_restart; |
282 | 282 | ||
283 | cep = (struct scc_enet_private *)dev->priv; | 283 | cep = dev->priv; |
284 | 284 | ||
285 | /* Get the interrupt events that caused us to be here. | 285 | /* Get the interrupt events that caused us to be here. |
286 | */ | 286 | */ |
diff --git a/arch/ppc/8260_io/fcc_enet.c b/arch/ppc/8260_io/fcc_enet.c index 6f3ed6a72e0..a3a27dafff1 100644 --- a/arch/ppc/8260_io/fcc_enet.c +++ b/arch/ppc/8260_io/fcc_enet.c | |||
@@ -524,7 +524,7 @@ fcc_enet_timeout(struct net_device *dev) | |||
524 | 524 | ||
525 | /* The interrupt handler. */ | 525 | /* The interrupt handler. */ |
526 | static irqreturn_t | 526 | static irqreturn_t |
527 | fcc_enet_interrupt(int irq, void * dev_id) | 527 | fcc_enet_interrupt(int irq, void *dev_id) |
528 | { | 528 | { |
529 | struct net_device *dev = dev_id; | 529 | struct net_device *dev = dev_id; |
530 | volatile struct fcc_enet_private *cep; | 530 | volatile struct fcc_enet_private *cep; |
@@ -532,7 +532,7 @@ fcc_enet_interrupt(int irq, void * dev_id) | |||
532 | ushort int_events; | 532 | ushort int_events; |
533 | int must_restart; | 533 | int must_restart; |
534 | 534 | ||
535 | cep = (struct fcc_enet_private *)dev->priv; | 535 | cep = dev->priv; |
536 | 536 | ||
537 | /* Get the interrupt events that caused us to be here. | 537 | /* Get the interrupt events that caused us to be here. |
538 | */ | 538 | */ |