Merge git://git.infradead.org/users/dwmw2/atm

David Woodhouse says:

====================
This is the result of pulling on the thread started by Krzysztof Mazur's
original patch 'pppoatm: don't send frames to destroyed vcc'.

Various problems in the pppoatm and br2684 code are solved, some of which
were easily triggered and would panic the kernel.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 2 insertions, 0 deletions

diff --git a/include/linux/atmdev.h b/include/linux/atmdev.h
index 22ef21c33d0c..c1da539f5e28 100644
--- a/include/linux/atmdev.h
+++ b/include/linux/atmdev.h
@@ -99,6 +99,7 @@ struct atm_vcc {
         struct atm_dev  *dev;           /* device back pointer */
         struct atm_qos  qos;            /* QOS */
         struct atm_sap  sap;            /* SAP */
+        void (*release_cb)(struct atm_vcc *vcc); /* release_sock callback */
         void (*push)(struct atm_vcc *vcc,struct sk_buff *skb);
         void (*pop)(struct atm_vcc *vcc,struct sk_buff *skb); /* optional */
         int (*push_oam)(struct atm_vcc *vcc,void *cell);
@@ -106,6 +107,7 @@ struct atm_vcc {
         void            *dev_data;      /* per-device data */
         void            *proto_data;    /* per-protocol data */
         struct k_atm_aal_stats *stats;  /* pointer to AAL stats group */
+        struct module *owner;           /* owner of ->push function */
         /* SVC part --- may move later ------------------------------------- */
         short           itf;            /* interface number */
         struct sockaddr_atmsvc local;