serial: bfin_uart: RTS and CTS MMRs can be either 16-bit width or 32-bit width.

[~andy/linux] / net / dccp / qpolicy.c

diff --git a/net/dccp/qpolicy.c b/net/dccp/qpolicy.c
index 414696b0d83044b9174d4c2821266b1930d6e807..63c30bfa4703ff0411cc874ef0c10d6c4b793a84 100644 (file)
--- a/net/dccp/qpolicy.c
+++ b/net/dccp/qpolicy.c
@@ -73,17 +73,20 @@ static struct dccp_qpolicy_operations {
        void            (*push) (struct sock *sk, struct sk_buff *skb);
        bool            (*full) (struct sock *sk);
        struct sk_buff* (*top)  (struct sock *sk);
+       __be32          params;
 
 } qpol_table[DCCPQ_POLICY_MAX] = {
        [DCCPQ_POLICY_SIMPLE] = {
-               .push = qpolicy_simple_push,
-               .full = qpolicy_simple_full,
-               .top  = qpolicy_simple_top,
+               .push   = qpolicy_simple_push,
+               .full   = qpolicy_simple_full,
+               .top    = qpolicy_simple_top,
+               .params = 0,
        },
        [DCCPQ_POLICY_PRIO] = {
-               .push = qpolicy_simple_push,
-               .full = qpolicy_prio_full,
-               .top  = qpolicy_prio_best_skb,
+               .push   = qpolicy_simple_push,
+               .full   = qpolicy_prio_full,
+               .top    = qpolicy_prio_best_skb,
+               .params = DCCP_SCM_PRIORITY,
        },
 };
 
@@ -117,10 +120,18 @@ struct sk_buff *dccp_qpolicy_pop(struct sock *sk)
 {
        struct sk_buff *skb = dccp_qpolicy_top(sk);
 
-       /* Clear any skb fields that we used internally */
-       skb->priority = 0;
-
-       if (skb)
+       if (skb != NULL) {
+               /* Clear any skb fields that we used internally */
+               skb->priority = 0;
                skb_unlink(skb, &sk->sk_write_queue);
+       }
        return skb;
 }
+
+bool dccp_qpolicy_param_ok(struct sock *sk, __be32 param)
+{
+       /* check if exactly one bit is set */
+       if (!param || (param & (param - 1)))
+               return false;
+       return (qpol_table[dccp_sk(sk)->dccps_qpolicy].params & param) == param;
+}