Unified · Split
| @@ -128,6 +128,7 @@ struct xfrm_state_walk { · 127 unmodified lines | |||
| 128 | 128 | ||
| 129 | struct xfrm_state_offload { | 129 | struct xfrm_state_offload { |
| 130 | struct net_device *dev; | 130 | struct net_device *dev; |
| 131 | netdevice_tracker dev_tracker; | ||
| 131 | struct net_device *real_dev; | 132 | struct net_device *real_dev; |
| 132 | unsigned long offload_handle; | 133 | unsigned long offload_handle; |
| 133 | unsigned int num_exthdrs; | 134 | unsigned int num_exthdrs; |
| @@ -1913,7 +1914,7 @@ static inline void xfrm_dev_state_free(struct xfrm_state *x) · 1779 unmodified lines | |||
| 1913 | if (dev->xfrmdev_ops->xdo_dev_state_free) | 1914 | if (dev->xfrmdev_ops->xdo_dev_state_free) |
| 1914 | dev->xfrmdev_ops->xdo_dev_state_free(x); | 1915 | dev->xfrmdev_ops->xdo_dev_state_free(x); |
| 1915 | xso->dev = NULL; | 1916 | xso->dev = NULL; |
| 1916 | dev_put(dev); | 1917 | dev_put_track(dev, &xso->dev_tracker); |
| 1917 | } | 1918 | } |
| 1918 | } | 1919 | } |
| 1919 | #else | 1920 | #else |
| @@ -259,6 +259,7 @@ int xfrm_dev_state_add(struct net *net, struct xfrm_state *x, · 258 unmodified lines | |||
| 259 | } | 259 | } |
| 260 | 260 | ||
| 261 | xso->dev = dev; | 261 | xso->dev = dev; |
| 262 | netdev_tracker_alloc(dev, &xso->dev_tracker, GFP_ATOMIC); | ||
| 262 | xso->real_dev = dev; | 263 | xso->real_dev = dev; |
| 263 | xso->num_exthdrs = 1; | 264 | xso->num_exthdrs = 1; |
| 264 | xso->flags = xuo->flags; | 265 | xso->flags = xuo->flags; |
| @@ -269,7 +270,7 @@ int xfrm_dev_state_add(struct net *net, struct xfrm_state *x, · 4 unmodified lines | |||
| 269 | xso->flags = 0; | 270 | xso->flags = 0; |
| 270 | xso->dev = NULL; | 271 | xso->dev = NULL; |
| 271 | xso->real_dev = NULL; | 272 | xso->real_dev = NULL; |
| 272 | dev_put(dev); | 273 | dev_put_track(dev, &xso->dev_tracker); |
| 273 | 274 | ||
| 274 | if (err != -EOPNOTSUPP) | 275 | if (err != -EOPNOTSUPP) |
| 275 | return err; | 276 | return err; |