]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
ibm_newemac: Fix dangerous struct assumption
authorJean Delvare <khali@linux-fr.org>
Mon, 6 Apr 2009 02:27:10 +0000 (02:27 +0000)
committerDavid S. Miller <davem@davemloft.net>
Tue, 7 Apr 2009 00:07:59 +0000 (17:07 -0700)
The ibm_newemac driver includes code which assumes that the
work_struct which is included in every delayed_work is the first
member of that structure. This is currently the case but might change
in the future, so use to_delayed_work() instead, which doesn't make
such an assumption.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: Josh Boyer <jwboyer@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ibm_newemac/core.c

index a815e17a0ab407a4dabd4a86af4beb47a679d853..77e4b5b52fc808f0c2b5bfdfd17435b74ed6de4f 100644 (file)
@@ -1229,7 +1229,7 @@ static int emac_link_differs(struct emac_instance *dev)
 static void emac_link_timer(struct work_struct *work)
 {
        struct emac_instance *dev =
 static void emac_link_timer(struct work_struct *work)
 {
        struct emac_instance *dev =
-               container_of((struct delayed_work *)work,
+               container_of(to_delayed_work(work),
                             struct emac_instance, link_work);
        int link_poll_interval;
 
                             struct emac_instance, link_work);
        int link_poll_interval;