Merge branches 'release', 'bugzilla-6217', 'bugzilla-6629', 'bugzilla-6933', 'bugzill...

[~andy/linux] / drivers / s390 / net / qeth.h

diff --git a/drivers/s390/net/qeth.h b/drivers/s390/net/qeth.h
index 6d4959807abcc0e291f217bfcccb6898360c2de9..8c6b72d05b1d63e9655bf19223704182f74a18f7 100644 (file)
--- a/drivers/s390/net/qeth.h
+++ b/drivers/s390/net/qeth.h
@@ -833,8 +833,7 @@ struct qeth_card {
        struct qeth_qdio_info qdio;
        struct qeth_perf_stats perf_stats;
        int use_hard_stop;
-       int (*orig_hard_header)(struct sk_buff *,struct net_device *,
-                               unsigned short,void *,void *,unsigned);
+       const struct header_ops *orig_header_ops;
        struct qeth_osn_info osn_info;
        atomic_t force_alloc_skb;
 };