1 files changed, 4 insertions, 1 deletions

diff --git a/net/x25/x25_route.c b/net/x25/x25_route.c
index 2a3fe986b245..060fcfaa2f47 100644
--- a/net/x25/x25_route.c
+++ b/net/x25/x25_route.c
@@ -3,7 +3,7 @@
  *
  *      This is ALPHA test software. This code may break your machine,
  *      randomly fail to work with new releases, misbehave and/or generally
- *      screw up. It might even work. 
+ *      screw up. It might even work.
  *
  *      This code REQUIRES 2.1.15 or higher
  *
@@ -119,6 +119,9 @@ void x25_route_device_down(struct net_device *dev)
                         __x25_remove_route(rt);
         }
         write_unlock_bh(&x25_route_list_lock);
+
+        /* Remove any related forwarding */
+        x25_clear_forward_by_dev(dev);
 }
 
 /*